diff --git a/debian_me/rules b/debian_me/rules
index 56b691fb..96cc8022 100755
--- a/debian_me/rules
+++ b/debian_me/rules
@@ -41,10 +41,10 @@ install: build
 	dh_prep  
 	dh_installdirs
 
-	chmod +x src/start.py
+	chmod +x src/run.py
 	cp -R src/ $(CURDIR)/debian/dupeguru-me/usr/local/share/dupeguru_me
 	cp $(CURDIR)/debian/dupeguru_me.desktop $(CURDIR)/debian/dupeguru-me/usr/share/applications
-	ln -s /usr/local/share/dupeguru_me/start.py $(CURDIR)/debian/dupeguru-me/usr/local/bin/dupeguru_me
+	ln -s /usr/local/share/dupeguru_me/run.py $(CURDIR)/debian/dupeguru-me/usr/local/bin/dupeguru_me
 
 
 # Build architecture-independent files here.
diff --git a/debian_pe/rules b/debian_pe/rules
index 3345f39d..f452fed8 100755
--- a/debian_pe/rules
+++ b/debian_pe/rules
@@ -41,10 +41,10 @@ install: build
 	dh_prep  
 	dh_installdirs
 
-	chmod +x src/start.py
+	chmod +x src/run.py
 	cp -R src/ $(CURDIR)/debian/dupeguru-pe/usr/local/share/dupeguru_pe
 	cp $(CURDIR)/debian/dupeguru_pe.desktop $(CURDIR)/debian/dupeguru-pe/usr/share/applications
-	ln -s /usr/local/share/dupeguru_pe/start.py $(CURDIR)/debian/dupeguru-pe/usr/local/bin/dupeguru_pe
+	ln -s /usr/local/share/dupeguru_pe/run.py $(CURDIR)/debian/dupeguru-pe/usr/local/bin/dupeguru_pe
 
 
 # Build architecture-independent files here.
diff --git a/debian_se/rules b/debian_se/rules
index af886a30..1b6fc4af 100755
--- a/debian_se/rules
+++ b/debian_se/rules
@@ -41,10 +41,10 @@ install: build
 	dh_prep  
 	dh_installdirs
 
-	chmod +x src/start.py
+	chmod +x src/run.py
 	cp -R src/ $(CURDIR)/debian/dupeguru-se/usr/local/share/dupeguru_se
 	cp $(CURDIR)/debian/dupeguru_se.desktop $(CURDIR)/debian/dupeguru-se/usr/share/applications
-	ln -s /usr/local/share/dupeguru_se/start.py $(CURDIR)/debian/dupeguru-se/usr/local/bin/dupeguru_se
+	ln -s /usr/local/share/dupeguru_se/run.py $(CURDIR)/debian/dupeguru-se/usr/local/bin/dupeguru_se
 
 
 # Build architecture-independent files here.
diff --git a/package.py b/package.py
index e24a5dac..5f3c1601 100644
--- a/package.py
+++ b/package.py
@@ -28,8 +28,6 @@ def package_cocoa(edition):
     build_dmg(app_path, '.')
 
 def package_windows(edition, dev):
-    # On Windows, PyInstaller is used to build an exe (py2exe creates a very bad looking icon)
-    # The release version is outdated. Use at least r672 on http://svn.pyinstaller.org/trunk
     if sys.platform != "win32":
         print("Qt packaging only works under Windows.")
         return
@@ -37,7 +35,6 @@ def package_windows(edition, dev):
     modname = 'qt.{0}.app'.format(edition)
     appmod = importlib.import_module(modname)
     DupeGuru = appmod.DupeGuru
-    #distdir = op.join('qt', edition, 'dist')
     distdir = 'dist'
     
     if op.exists(distdir):
@@ -76,9 +73,9 @@ def package_windows(edition, dev):
         os.remove('installer_tmp.back.aip')
 
 def package_debian(edition):
-    add_to_pythonpath('qt')
-    add_to_pythonpath(op.join('qt', edition))
-    from app import DupeGuru
+    modname = 'qt.{0}.app'.format(edition)
+    appmod = importlib.import_module(modname)
+    DupeGuru = appmod.DupeGuru
     
     if op.exists('build'):
         shutil.rmtree('build')
@@ -87,8 +84,9 @@ def package_debian(edition):
     srcpath = op.join(destpath, 'src')
     help_src = ed('help_{0}')
     os.makedirs(destpath)
-    shutil.copytree(ed('qt/{0}'), srcpath)
-    packages = ['hscommon', 'hsgui', 'core', ed('core_{0}'), 'qtlib', 'qt/base', 'hsutil', 'send2trash']
+    os.makedirs(srcpath)
+    shutil.copy('run.py', op.join(srcpath, 'run.py'))
+    packages = ['hscommon', 'hsgui', 'core', ed('core_{0}'), 'qtlib', 'qt', 'hsutil', 'send2trash']
     if edition == 'me':
         packages.append('hsaudiotag')
     copy_packages(packages, srcpath)