diff --git a/CHANGELOG b/CHANGELOG
index 97d0c48f..d35f4e99 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.3.6 16/06/2015
+
+* Fix an issue with 1.4dev compatibility
+
 ## 1.3.5 16/06/15
 
 * Ignore invalid characters when reading the output of a process
diff --git a/gns3server/version.py b/gns3server/version.py
index 6f2942ff..3d5005ee 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.6dev1"
-__version_info__ = (1, 3, 6, -99)
+__version__ = "1.3.6"
+__version_info__ = (1, 3, 6, 0)