diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..94ae1ea
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,23 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+## 0.2.0 - 2017-06-02
+### Added
+- One-shot auth and isuser tests
+- Support for running under downloaded ejabberd*.deb (`xmpp-cloud-auth.sh`)
+
+### Fixed
+- Allow passwords with colons
+
+### Changed
+- Internal cleanup
+   - better logging
+   - generator functions
+
+## 0.1.0 - 2016-05-02
+- Initial release
diff --git a/external_cloud.py b/external_cloud.py
index c9f95c9..7ca51ed 100755
--- a/external_cloud.py
+++ b/external_cloud.py
@@ -16,6 +16,7 @@
 DEFAULT_LOG_DIR = '/var/log/ejabberd'
 URL = ''
 SECRET = ''
+VERSION = '0.2.0'
 
 usersafe_encoding = maketrans('-$%', 'OIl')
 
@@ -200,6 +201,8 @@ def getArgs():
         action='store_true',
         help='enable debug mode')
 
+    parser.add_argument('--version', action='version', version=VERSION)
+
     parser.add_argument('-A', '--auth-test',
 	nargs=3, metavar=("USER", "DOMAIN", "PASSWORD"),
         help='one-shot query of the user, domain, and password triple; does not keep running and ignores the "-t" value')
@@ -227,7 +230,7 @@ def getArgs():
     else:
         logging.basicConfig(stream=sys.stdout,level=LEVEL,format='%(asctime)s %(levelname)s: %(message)s')
 
-    logging.info('Start external auth script for %s with endpoint: %s', TYPE, URL)
+    logging.info('Start external auth script %s for %s with endpoint: %s', VERSION, TYPE, URL)
     logging.debug('Log level: %s', 'DEBUG' if DEBUG else 'INFO')
 
     if ISUSER_TEST: