diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10b6ee08c4..a7af4c3b3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -163,7 +163,7 @@
 
 ([Commits](https://github.com/foosel/OctoPrint/compare/1.2.16...1.3.0rc1))
 
-## 1.2.18rc1 (2016-11-22)
+## 1.2.18 (2016-11-30)
 
 ### Improvements
 
@@ -179,7 +179,11 @@
   * [#1571](https://github.com/foosel/OctoPrint/issues/1571) - Fix parsing of port number from HTTP Host header for IPv6 addresses
   * Fix issue with settings restriction causing internal settings defaults to be changed.
 
-([Commits](https://github.com/foosel/OctoPrint/compare/1.2.17...1.2.18))
+### More information
+
+  * [Commits](https://github.com/foosel/OctoPrint/compare/1.2.17...1.2.18)
+  * Release Candidates:
+    * [1.2.18rc1](https://github.com/foosel/OctoPrint/releases/tag/1.2.18rc1)
 
 ## 1.2.17 (2016-11-08)