diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 5911773..cbdf227 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -85,11 +85,11 @@
     full_current_version = current_version
 
 extensions = [
-    'bz2.pyd',
     'pyexpat.pyd',
     'select.pyd',
     'unicodedata.pyd',
     'winsound.pyd',
+    '_bz2.pyd',
     '_elementtree.pyd',
     '_socket.pyd',
     '_ssl.pyd',
@@ -100,7 +100,8 @@
     '_ctypes_test.pyd',
     '_sqlite3.pyd',
     '_hashlib.pyd',
-    '_multiprocessing.pyd'
+    '_multiprocessing.pyd',
+    '_lzma.pyd'
 ]
 
 # Well-known component UUIDs
@@ -912,6 +913,21 @@
             print "Warning: Unpackaged files in %s" % self.absolute
             print self.unpackaged_files
 
+
+def inside_test(dir):
+    if dir.physical in ('test', 'tests'):
+        return True
+    if dir.basedir:
+        return inside_test(dir.basedir)
+    return False
+
+def in_packaging_tests(dir):
+    if dir.physical == 'tests' and dir.basedir.physical == 'packaging':
+        return True
+    if dir.basedir:
+        return in_packaging_tests(dir.basedir)
+    return False
+
 # See "File Table", "Component Table", "Directory Table",
 # "FeatureComponents Table"
 def add_files(db):
@@ -987,11 +1003,7 @@
             if not have_tcl:
                 continue
             tcltk.set_current()
-        elif dir in ['test', 'tests', 'data', 'output']:
-            # test: Lib, Lib/email, Lib/ctypes, Lib/sqlite3
-            # tests: Lib/distutils
-            # data: Lib/email/test
-            # output: Lib/test
+        elif dir in ('test', 'tests') or inside_test(parent):
             testsuite.set_current()
         elif not have_ctypes and dir == "ctypes":
             continue
@@ -1028,6 +1040,7 @@
             lib.glob("cfgparser.*")
             lib.add_file("zip_cp437_header.zip")
             lib.add_file("zipdir.zip")
+            lib.add_file("mime.types")
         if dir=='capath':
             lib.glob("*.0")
         if dir=='tests' and parent.physical=='distutils':
@@ -1060,6 +1073,25 @@
             lib.add_file("turtle.cfg")
         if dir=="pydoc_data":
             lib.add_file("_pydoc.css")
+        if dir.endswith('.dist-info'):
+            lib.add_file('INSTALLER')
+            lib.add_file('REQUESTED')
+            lib.add_file('RECORD')
+            lib.add_file('METADATA')
+            lib.glob('RESOURCES')
+        if dir.endswith('.egg-info') or dir == 'EGG-INFO':
+            lib.add_file('PKG-INFO')
+        if in_packaging_tests(parent):
+            lib.glob('*.html')
+            lib.glob('*.tar.gz')
+        if dir=='fake_dists':
+            # cannot use glob since there are also egg-info directories here
+            lib.add_file('cheese-2.0.2.egg-info')
+            lib.add_file('nut-funkyversion.egg-info')
+            lib.add_file('strawberry-0.6.egg')
+            lib.add_file('truffles-5.0.egg-info')
+            lib.add_file('babar.cfg')
+            lib.add_file('babar.png')
         if dir=="data" and parent.physical=="test_email":
             # This should contain all non-.svn files listed in subversion
             for f in os.listdir(lib.absolute):
@@ -1068,6 +1100,10 @@
                     lib.add_file(f)
                 else:
                     print("WARNING: New file %s in test/test_email/data" % f)
+        if dir=='tests' and parent.physical == 'packaging':
+            lib.add_file('SETUPTOOLS-PKG-INFO2')
+            lib.add_file('SETUPTOOLS-PKG-INFO')
+            lib.add_file('PKG-INFO')
         for f in os.listdir(lib.absolute):
             if os.path.isdir(os.path.join(lib.absolute, f)):
                 pydirs.append((lib, f))