2 files changed, 5 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 5d2a7bbc8..8d186f2cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,15 +5,10 @@
 *.swo
 
 # Packages
+build/
+dist/
 src/Bcfg2
+*.pyc
+*.swp
 *.egg
 *.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
diff --git a/setup.py b/setup.py
index 64dcdeb50..678f050f1 100755
--- a/setup.py
+++ b/setup.py
@@ -142,7 +142,7 @@ setup(cmdclass=cmdclass,
                 "Bcfg2.Server.Snapshots",
                 ],
       install_requires=inst_reqs,
-      package_dir={'Bcfg2': 'src/lib/Bcfg2'},
+      package_dir={'': 'src/lib', },
       package_data={'Bcfg2.Server.Reports.reports': ['fixtures/*.xml',
                                                      'templates/*.html',
                                                      'templates/*/*.html',