diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cb700a..fd2d6f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Mobly Release History
 
+## Mobly Release 1.8.1: Fix Final Cleanup Stage Error Capture
+
+### Fixes
+* Errors from the final clean up stage are now properly recorded.
+  * NOTE: This may expose errors that have long existed in your tests. They are
+    usually caused by your test interrupting controller object life cycle
+    management. Fixing these issues would help keep your test env clean.
+* Fixed docs config so `http://mobly.readthedocs.io` show all the classes
+  properly.
+
+
 ## Mobly Release 1.8: Controller Management and `AndroidDevice` Service
 
 ### New
diff --git a/setup.py b/setup.py
index 36a5236..5a4937c 100755
--- a/setup.py
+++ b/setup.py
@@ -52,13 +52,13 @@
 def main():
     setuptools.setup(
         name='mobly',
-        version='1.8',
+        version='1.8.1',
         maintainer='Ang Li',
         maintainer_email='mobly-github@googlegroups.com',
         description='Automation framework for special end-to-end test cases',
         license='Apache2.0',
         url='https://github.com/google/mobly',
-        download_url='https://github.com/google/mobly/tarball/1.8',
+        download_url='https://github.com/google/mobly/tarball/1.8.1',
         packages=setuptools.find_packages(),
         include_package_data=False,
         scripts=['tools/sl4a_shell.py', 'tools/snippet_shell.py'],