diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a7fc06b8..5399db752 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ include(GNUInstallDirsWrapper)
 # Soname versioning
 set(FREERDP_VERSION_MAJOR "1")
 set(FREERDP_VERSION_MINOR "0")
-set(FREERDP_VERSION_REVISION "0")
+set(FREERDP_VERSION_REVISION "1")
 set(FREERDP_VERSION "${FREERDP_VERSION_MAJOR}.${FREERDP_VERSION_MINOR}")
 set(FREERDP_VERSION_FULL "${FREERDP_VERSION}.${FREERDP_VERSION_REVISION}")
 
diff --git a/ChangeLog b/ChangeLog
index 41ad685cc..614926172 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2012-02-07	Version 1.0.1
+
+FreeRDP 1.0.1 is a maintenance release to address a certain number of
+issues found in 1.0.0. This release also brings corrective measures
+to certificate validation which were required for inclusion in Ubuntu.
+
+* Certificate Validation
+	* Improved validation logic and robustness
+	* Added validation of certificate name against hostname
+
+* Token-based Server Redirection
+	* Fixed redirection logic
+	* HAProxy load-balancer support
+
+* xfreerdp-server
+	* better event handling
+	* capture performance improvements
+
+* wfreerdp
+	* Fix RemoteFX support
+	* Fix mingw64 compilation
+
+* libfreerdp-core:
+	* Fix severe TCP sending bug
+	* Added server-side Standard RDP security
+
 2012-01-16	Version 1.0.0
 
 License: