diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4d909cc5..8021554dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,44 @@
 ## Changelog
 
-### x.x.x
-
-**Commit Delta**: [Change from 0.8.0 release](https://github.com/plus3it/watchmaker/compare/0.8.0...x.x.x)
-
-**Released**: TBD
-
-**Summary**:
-
-*   TBD
+### 0.9.0
+
+**Commit Delta**: [Change from 0.8.0 release](https://github.com/plus3it/watchmaker/compare/0.8.0...0.9.0)
+
+**Released**: 2018.02.12
+
+**Summary**:
+
+*   [[Issue #499][499]][[PR #513][513]] Includes additional details about the
+    platform and python version in the watchmaker log
+*   [[Issue #500][500]][[PR #512][512]] Retries file retrieval up to 5 times
+*   [[Issue #501][501]][[PR #507][507]] Uses urllib handlers to retrieve all
+    files
+    -   Deprecates the argument `--s3-source`; to retrieve a file from an S3
+        bucket use the syntax: `s3://<bucket>/<key>`
+    -   Local files may be specified as absolute or relative paths, and may or
+        may not be prefixed with `file://`
+*   [[PR #496][496]] Moves CloudFormation and Terraform templates to their own
+    project, [terraform-aws-watchmaker][terraform-aws-watchmaker]
+*   [[PR #491][491]] Improves compatibility of the watchmaker bootstrap.ps1
+    script when executed by an Azure custom script extension
+*   [[Issue #430][430]][[PR #487][487]] Writes watchmaker salt config to a
+    custom path:
+    -   Windows: `C:\Watchmaker\Salt\conf`
+    -   Linux: `/opt/watchmaker/salt`
+*   scap-formula
+    -   Incorporates content from OpenSCAP Security Guide v0.1.37-1
+
+[430]: https://github.com/plus3it/watchmaker/issues/430
+[499]: https://github.com/plus3it/watchmaker/issues/499
+[500]: https://github.com/plus3it/watchmaker/issues/500
+[501]: https://github.com/plus3it/watchmaker/issues/501
+[487]: https://github.com/plus3it/watchmaker/pull/487
+[491]: https://github.com/plus3it/watchmaker/pull/491
+[496]: https://github.com/plus3it/watchmaker/pull/496
+[507]: https://github.com/plus3it/watchmaker/pull/507
+[512]: https://github.com/plus3it/watchmaker/pull/512
+[513]: https://github.com/plus3it/watchmaker/pull/513
+[terraform-aws-watchmaker]: https://github.com/plus3it/terraform-aws-watchmaker
 
 ### 0.8.0
 
diff --git a/setup.cfg b/setup.cfg
index 4a2b16151..5baa0b8c9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.8.1.dev
+version = 0.9.0
 author = Plus3IT Maintainers of Watchmaker
 author_email = projects@plus3it.com
 url = https://github.com/plus3it/watchmaker
diff --git a/src/watchmaker/static/salt/formulas/join-domain-formula b/src/watchmaker/static/salt/formulas/join-domain-formula
index b4e7058f7..fb827f6b0 160000
--- a/src/watchmaker/static/salt/formulas/join-domain-formula
+++ b/src/watchmaker/static/salt/formulas/join-domain-formula
@@ -1 +1 @@
-Subproject commit b4e7058f7b3c12b937ca6b2001da69fde36db630
+Subproject commit fb827f6b002d4e0faa680ca7ca29b1ff64f79432
diff --git a/src/watchmaker/static/salt/formulas/scap-formula b/src/watchmaker/static/salt/formulas/scap-formula
index e9cf9d794..182d54637 160000
--- a/src/watchmaker/static/salt/formulas/scap-formula
+++ b/src/watchmaker/static/salt/formulas/scap-formula
@@ -1 +1 @@
-Subproject commit e9cf9d794107c0cfc46c08da7ef4a37e0f71b564
+Subproject commit 182d54637037b96327675b17e12008c4f9db3626