diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py
index ff923221..6c4a3869 100644
--- a/calibre-plugin/__init__.py
+++ b/calibre-plugin/__init__.py
@@ -33,7 +33,7 @@ except NameError:
 from calibre.customize import InterfaceActionBase
 
 # pulled out from FanFicFareBase for saving in prefs.py
-__version__ = (2, 16, 3)
+__version__ = (2, 16, 4)
 
 ## Apparently the name for this class doesn't matter--it was still
 ## 'demo' for the first few versions.
diff --git a/fanficfare/cli.py b/fanficfare/cli.py
index b15eb4b5..312e3d2f 100644
--- a/fanficfare/cli.py
+++ b/fanficfare/cli.py
@@ -29,7 +29,7 @@ import sys
 import pickle
 import cookielib as cl
 
-version="2.16.3"
+version="2.16.4"
 
 if sys.version_info < (2, 5):
     print 'This program requires Python 2.5 or newer.'
diff --git a/setup.py b/setup.py
index 61725efa..e01f025c 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ setup(
     name="FanFicFare",
 
     # Versions should comply with PEP440.
-    version="2.16.3",
+    version="2.16.4",
 
     description='A tool for downloading fanfiction to eBook formats',
     long_description=long_description,
diff --git a/version_update.py b/version_update.py
index 1d59185d..928052eb 100644
--- a/version_update.py
+++ b/version_update.py
@@ -23,7 +23,7 @@ save_file='webservice/app.yaml'
 saved_version = None
 
 def main(args):
-   ## major.minor.micro
+   ## major minor micro
     '''
 __version__ = (2, 3, 6)
     version="2.3.6",
@@ -51,7 +51,7 @@ version="2.3.6"
     if int(args[-1]) > 0:
         release = 'Test'
     print('\ngit add %s'%(" ".join(version_files+index_files)))
-    print('git commit -m "Bump %s Version"'%release)
+    print('git commit -m "Bump %s Version %s"'%(release,'.'.join(args)))
 
 def do_loop(files, pattern, substring):
     global saved_version
diff --git a/webservice/app.yaml b/webservice/app.yaml
index 93fd3275..1a659cf7 100644
--- a/webservice/app.yaml
+++ b/webservice/app.yaml
@@ -1,6 +1,6 @@
 # ffd-retief-hrd fanficfare
 application: fanficfare
-version: 2-16-3
+version: 2-16-4
 runtime: python27
 api_version: 1
 threadsafe: true