diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4526d6e1..a3d962c2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,11 @@
 Change Log
 ==========
+2.6.4
+-----
+
+Fixed bugs:
+    - fix panels margins not refreshed if panel.setVisible has been called while the editor widget was not visible.
+    - fix bug with filewatcher on file deleted if the user choose to keep the editor open
 2.6.3
 -----
 
diff --git a/pyqode/core/__init__.py b/pyqode/core/__init__.py
index 358fbd6b..11d2f5aa 100644
--- a/pyqode/core/__init__.py
+++ b/pyqode/core/__init__.py
@@ -8,4 +8,4 @@
 widget, i.e. pyqode.core is a generic code editor widget.
 """
 
-__version__ = '2.6.4.dev0'
+__version__ = '2.6.4'