diff --git a/MANIFEST.in b/MANIFEST.in
index b214dd65c..259f1da1c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,6 @@ include MANIFEST.in
 include NEWS
 include RELEASE_NOTES
 include TODO
-include setup.cfg
 include TestPlan.txt
 recursive-include data *
 recursive-include debian *
diff --git a/setup.py b/setup.py
index 65dd4c5f0..c7a7c2a49 100644
--- a/setup.py
+++ b/setup.py
@@ -300,48 +300,50 @@ setup(name = 'gramps',
       platforms = ['FreeBSD', 'Linux', 'MacOS', 'Windows'],
       cmdclass = {'build': build, 'install': install},
       package_dir = {'gramps': 'src'}, 
-      packages = ['gramps', 
-                  'gramps.DateHandler', 
-                  'gramps.Filters', 
-                  'gramps.Filters.Rules', 
-                  'gramps.Filters.Rules.Citation', 
-                  'gramps.Filters.Rules.Event', 
-                  'gramps.Filters.Rules.Family', 
-                  'gramps.Filters.Rules.MediaObject', 
-                  'gramps.Filters.Rules.Note', 
-                  'gramps.Filters.Rules.Person', 
-                  'gramps.Filters.Rules.Place', 
-                  'gramps.Filters.Rules.Repository', 
-                  'gramps.Filters.Rules.Source', 
-                  'gramps.Filters.SideBar', 
-                  'gramps.GrampsLocale', 
-                  'gramps.GrampsLogger', 
-                  'gramps.Merge', 
-                  'gramps.Simple', 
-                  'gramps.cli', 
-                  'gramps.cli.plug', 
-                  'gramps.docgen', 
-                  'gramps.gen', 
-                  'gramps.gen.db', 
-                  'gramps.gen.display', 
-                  'gramps.gen.lib', 
-                  'gramps.gen.mime', 
-                  'gramps.gen.plug', 
-                  'gramps.gen.plug.docbackend', 
-                  'gramps.gen.plug.docgen', 
-                  'gramps.gen.plug.menu', 
-                  'gramps.gen.plug.report', 
-                  'gramps.gen.proxy', 
-                  'gramps.gen.utils', 
-                  'gramps.gui', 
-                  'gramps.gui.editors', 
-                  'gramps.gui.editors.displaytabs', 
-                  'gramps.gui.plug', 
-                  'gramps.gui.plug.report', 
-                  'gramps.gui.selectors', 
-                  'gramps.gui.views', 
-                  'gramps.gui.views.treemodels', 
-                  'gramps.gui.widgets'],
+      packages = ['gramps',
+            'gramps.GrampsLocale',
+            'gramps.GrampsLogger',
+            'gramps.Simple',
+            'gramps.cli',
+            'gramps.cli.plug',
+            'gramps.docgen',
+            'gramps.gen',
+            'gramps.gen.datehandler',
+            'gramps.gen.db',
+            'gramps.gen.display',
+            'gramps.gen.filters',
+            'gramps.gen.filters.rules',
+            'gramps.gen.filters.rules.citation',
+            'gramps.gen.filters.rules.event',
+            'gramps.gen.filters.rules.family',
+            'gramps.gen.filters.rules.media',
+            'gramps.gen.filters.rules.note',
+            'gramps.gen.filters.rules.person',
+            'gramps.gen.filters.rules.place',
+            'gramps.gen.filters.rules.repository',
+            'gramps.gen.filters.rules.source',
+            'gramps.gen.lib',
+            'gramps.gen.merge',
+            'gramps.gen.mime',
+            'gramps.gen.plug',
+            'gramps.gen.plug.docbackend',
+            'gramps.gen.plug.docgen',
+            'gramps.gen.plug.menu',
+            'gramps.gen.plug.report',
+            'gramps.gen.proxy',
+            'gramps.gen.utils',
+            'gramps.gui',
+            'gramps.gui.editors',
+            'gramps.gui.editors.displaytabs',
+            'gramps.gui.filters',
+            'gramps.gui.filters.sidebar',
+            'gramps.gui.merge',
+            'gramps.gui.plug',
+            'gramps.gui.plug.report',
+            'gramps.gui.selectors',
+            'gramps.gui.views',
+            'gramps.gui.views.treemodels',
+            'gramps.gui.widgets'],
       package_data={'gramps': ['data/*.txt', 
                                'data/*.xml',
                                'data/templates/*.html',