diff --git a/setup/commands.py b/setup/commands.py
index febc684c08..c7aa3ab307 100644
--- a/setup/commands.py
+++ b/setup/commands.py
@@ -21,7 +21,7 @@ __all__ = [
         'linux32', 'linux64', 'linux', 'linux_freeze',
         'osx32_freeze', 'osx', 'rsync', 'push',
         'win32_freeze', 'win32', 'win',
-        'stage1', 'stage2', 'stage3', 'stage4', 'publish'
+        'stage1', 'stage2', 'stage3', 'stage4', 'stage5', 'publish'
         ]
 
 
@@ -54,13 +54,14 @@ resources = Resources()
 kakasi = Kakasi()
 
 from setup.publish import Manual, TagRelease, Stage1, Stage2, \
-        Stage3, Stage4, Publish
+        Stage3, Stage4, Stage5, Publish
 manual = Manual()
 tag_release = TagRelease()
 stage1 = Stage1()
 stage2 = Stage2()
 stage3 = Stage3()
 stage4 = Stage4()
+stage5 = Stage5()
 publish = Publish()
 
 from setup.upload import UploadUserManual, UploadInstallers, UploadDemo, \
diff --git a/setup/publish.py b/setup/publish.py
index 5c6b5563e9..26769f271e 100644
--- a/setup/publish.py
+++ b/setup/publish.py
@@ -37,19 +37,20 @@ class Stage2(Command):
        if os.path.exists(build):
            shutil.rmtree(build)
 
-
-
 class Stage3(Command):
 
    description = 'Stage 3 of the publish process'
-   sub_commands = ['upload_user_manual', 'upload_demo', 'sdist',
-            'upload_to_sourceforge', 'upload_to_google_code',
-            'tag_release', 'upload_to_server',
-   ]
+   sub_commands = ['upload_user_manual', 'upload_demo', 'sdist']
 
 class Stage4(Command):
 
     description = 'Stage 4 of the publish process'
+    sub_commands = ['upload_to_sourceforge', 'upload_to_google_code']
+
+class Stage5(Command):
+
+    description = 'Stage 5 of the publish process'
+    sub_commands = ['tag_release', 'upload_to_server']
 
     def run(self, opts):
         subprocess.check_call('rm -rf build/* dist/*', shell=True)
@@ -57,7 +58,7 @@ class Stage4(Command):
 class Publish(Command):
 
     description = 'Publish a new calibre release'
-    sub_commands = ['stage1', 'stage2', 'stage3', 'stage4']
+    sub_commands = ['stage1', 'stage2', 'stage3', 'stage4', 'stage5', ]
 
 class Manual(Command):