diff --git a/changelog.md b/changelog.md
index f5edb9b..0640470 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,9 @@ HEAD
   rather than connection pre_init. This allows setting of socket options prior
   to the bind/listen/accept system calls. Thank you ChristianRobl3D for
   reporting #530.
+- Compatibility: Make sure the chrono library used by Boost/Asio is in sync
+  with what the websocketpp is using. Thank you Flow86 for reporting and a
+  patch.
 
 0.7.0 - 2016-02-22
 - MINOR BREAKING SOCKET POLICY CHANGE: Asio transport socket policy method 
diff --git a/readme.md b/readme.md
index d31919b..b0b2e9b 100644
--- a/readme.md
+++ b/readme.md
@@ -28,7 +28,7 @@ Get Involved
 http://www.zaphoyd.com/websocketpp/
 
 **User Manual**
-http://www.zaphoyd.com/websocketpp/manual/
+http://docs.websocketpp.org/
 
 **GitHub Repository**
 https://github.com/zaphoyd/websocketpp/