diff --git a/src/calibre/trac/plugins/Changelog.py b/src/calibre/trac/plugins/Changelog.py
index e9a76d8d4c..05f1b4456f 100644
--- a/src/calibre/trac/plugins/Changelog.py
+++ b/src/calibre/trac/plugins/Changelog.py
@@ -39,7 +39,7 @@ class ChangelogFormatter(blog.LogFormatter):
             self.messages = collections.deque()
             
         else:
-            if re.search(r'[a-zA-Z]', msg):
+            if re.search(r'[a-zA-Z]', msg) and len(msg.strip()) > 5:
                 if 'translation' not in msg and not msg.startswith('IGN'):
                     self.messages.append(msg.strip())
                     
diff --git a/src/calibre/trac/plugins/templates/distro.html b/src/calibre/trac/plugins/templates/distro.html
index 9ca05002b9..d05c758ed3 100644
--- a/src/calibre/trac/plugins/templates/distro.html
+++ b/src/calibre/trac/plugins/templates/distro.html
@@ -41,7 +41,7 @@
 wget -O- http://calibre.kovidgoyal.net/downloads/calibre-0.4.83.tar.bz2 | tar xvj 
 cd calibre*
 python setup.py build && sudo python setup.py install
-            </pre>
+            </pre></li>
         </ol>
         <h2>Dependencies</h2>
         <table border="1" cellpadding="10">
diff --git a/upload.py b/upload.py
index 669dc9ba0d..9c5d17c4d4 100644
--- a/upload.py
+++ b/upload.py
@@ -229,9 +229,10 @@ def stage_two():
 def stage_three():
     print 'Uploading installers...'
     upload_installers()
-    print 'Uploading to PyPI'
+    print 'Uploading documentation...'
     upload_docs()
     upload_user_manual()
+    print 'Uploading to PyPI...'
     check_call('rm -f dist/*')
     check_call('python setup.py register')
     check_call('python setup.py bdist_egg --exclude-source-files')