diff --git a/Makefile b/Makefile
index 6616ae7d98..6ced0750b9 100644
--- a/Makefile
+++ b/Makefile
@@ -40,3 +40,7 @@ pictureflow :
 
 pot :
 	cd src/calibre/translations && ${PYTHON} __init__.py pot
+
+egg : all
+	${PYTHON} setup.py register bdist_egg --exclude-source-files upload
+
diff --git a/src/calibre/gui2/library.py b/src/calibre/gui2/library.py
index 15453127c2..dd70a99533 100644
--- a/src/calibre/gui2/library.py
+++ b/src/calibre/gui2/library.py
@@ -35,7 +35,7 @@ class LibraryDelegate(QItemDelegate):
         gradient = QLinearGradient(0, 0, 0, 100)
         gradient.setColorAt(0.0, self.COLOR)
         gradient.setColorAt(1.0, self.COLOR)
-        self. brush = QBrush(gradient)
+        self.brush = QBrush(gradient)
         self.factor = self.SIZE/100.
 
     def sizeHint(self, option, index):
diff --git a/src/calibre/parallel.py b/src/calibre/parallel.py
index a75490e3c2..c2f0149ae8 100644
--- a/src/calibre/parallel.py
+++ b/src/calibre/parallel.py
@@ -171,4 +171,4 @@ def main():
 if __name__ == '__main__':
     sys.exit(main())
 
-from calibre.utils.single_qt_application import SingleApplication
+
diff --git a/upload.py b/upload.py
index 8939e9eead..8f3ae8b1a0 100644
--- a/upload.py
+++ b/upload.py
@@ -127,6 +127,17 @@ def upload_tarball():
     check_call('ssh divok rm -f %s/calibre-\*.tar.bz2'%DOWNLOADS)
     check_call('scp dist/calibre-*.tar.bz2 divok:%s/'%DOWNLOADS)
 
+def pypi():
+    vm = '/vmware/linux/libprs500-gentoo.vmx'
+    vmware = ('vmware', '-q', '-x', '-n', vm)
+    subprocess.Popen(vmware)
+    print 'Waiting for linux to boot up...'
+    time.sleep(60)
+    check_call('scp ~/.pypirc linux:')
+    check_call('ssh linux make -C /mnt/hgfs/giskard/work/calibre egg')
+    check_call('ssh linux rm -f ~/.pypirc')
+    check_call('ssh linux sudo poweroff')
+
 def main():
     upload = len(sys.argv) < 2
     shutil.rmtree('build')
@@ -144,7 +155,7 @@ def main():
         print 'Uploading installers...'
         upload_installers()
         print 'Uploading to PyPI'
-        check_call('''python setup.py register bdist_egg --exclude-source-files upload''')
+        pypi()
         upload_tarball()
         upload_docs()
         upload_user_manual()