diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md
index e4f3135..d193533 100644
--- a/docs/ChangeLog.md
+++ b/docs/ChangeLog.md
@@ -16,6 +16,11 @@ Improvements:
 * Replaced GIF spinner with a pure CSS spinner using CSS3 animations [GH-177].
 * Adds Python 3.5 support [GH-179] [GH-180]
 
+Bug Fixes:
+
+* `manage.py version` command now returns a zero exit code [GH-182]
+* `manage.py version` now returns a version that matches the GitHub releases [GH-182]
+
 ### v1.1.0 - A Hard Day's Night
 
 BACKWARDS INCOMPATIBILITIES / NOTES:
diff --git a/manage.py b/manage.py
index 4bf5d9f..1f487b5 100644
--- a/manage.py
+++ b/manage.py
@@ -120,7 +120,7 @@ def resetadminpassword(username, new_password):
 @manager.command
 def version():
     """Returns the version of PostMaster"""
-    return __version__
+    print(__version__)
 
 
 if __name__ == "__main__":
diff --git a/postmaster/__init__.py b/postmaster/__init__.py
index ff6af1c..5551f57 100644
--- a/postmaster/__init__.py
+++ b/postmaster/__init__.py
@@ -10,7 +10,7 @@
 from flask_login import LoginManager
 from flask_bcrypt import Bcrypt
 
-__version__ = '1.1.0.0'
+__version__ = 'v1.1.0.0'
 app = Flask(__name__)
 
 if environ.get('POSTMASTER_DEV') == 'TRUE':