diff --git a/CHANGELOG b/CHANGELOG
index 1a06415e..004dcb14 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,18 @@
 # Change Log
 
+# 1.3.11 07/10/2015
+
+* Escape other usage of glob
+* Fix Dynamips identifier is already used by another router
+* Protect dynamips against bad glob
+* Catch ProcessLookupError in Qemu VM.
+* Use the correct UDP tunnel Qemu syntax for version > 1.1.0 when legacy networking is enabled.
+* Prevent launching a packet capture with a non-ASCII path when using Dynamips.
+* Do not automatically delete Dynamips bootflash file because they are necessary to restore VLANs on the c3600 platform.
+* Fix dynamips configuration lost when you delete a node
+* Clarify error message when we got UTF-8 chars in the iourc file
+* Check for valid FR or ATM switch mappings. Fixes #300.
+
 ## 1.3.10 04/09/2015
 
 * Catch exception when a process cannot be killed. Fixes #296.
diff --git a/gns3server/version.py b/gns3server/version.py
index 327af999..ce729c93 100644
--- a/gns3server/version.py
+++ b/gns3server/version.py
@@ -23,5 +23,5 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "1.3.11dev1"
-__version_info__ = (1, 3, 11, -99)
+__version__ = "1.3.11"
+__version_info__ = (1, 3, 11, 0)