diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 227cb1748..a7872c0c4 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -2,6 +2,37 @@
 Change Log
 ==========
 
+0.6.4 NULL pointer access fix and enhancements
+--------------------------------------------------------------------
+21-January-2018
+Bug Fixes:
+ * Final fix for `ValueError: NULL COM pointer access`.
+
+Enhancements:
+ * Multi-threading mode (MTA) for comtypes is enabled by default, if it's not initialized
+   by another library before importing pywinauto.
+
+ * Method ``get_value()`` has been added to EditWrapper in UIA backend.
+
+ * Method ``scroll()`` has been added for all UIA controls which have ScrollPattern implemented.
+
+ * Added methods ``is_minimized/is_maximized/is_normal/get_show_state`` for UIAWrapper.
+
+ * Added handling in-place controls inside ListView control and (row, column) indexing
+   in a grid-like table mode. Examples ::
+
+       auto_detected_ctrl = list_view.get_item(0).inplace_control()
+
+       combo = list_view.get_item(1,1).inplace_control("ComboBox")
+       combo.select("Item name")
+
+       edit = list_view.get_item(3,4).inplace_control("Edit")
+       edit.type_keys("some text{ENTER}", set_foreground=False)
+
+       dt_picker = list_view.get_item(2,0).inplace_control("DateTimePicker")
+
+
+
 0.6.3 A lot of improvements and some optimizations
 --------------------------------------------------------------------
 03-July-2017
diff --git a/pywinauto/__init__.py b/pywinauto/__init__.py
index 144284876..1b03ee800 100644
--- a/pywinauto/__init__.py
+++ b/pywinauto/__init__.py
@@ -32,7 +32,7 @@
 
 """Python package for automating GUI manipulation on Windows"""
 
-__version__ = "0.6.3"
+__version__ = "0.6.4"
 
 import sys  # noqa: E402
 import warnings  # noqa: E402
diff --git a/setup.py b/setup.py
index 80a72b791..537ad481b 100644
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,7 @@ def setup_path(path = ""):
     packages = ["pywinauto", "pywinauto.linux"]
 
 setup(name='pywinauto',
-    version = '0.6.3',
+    version = '0.6.4',
     description = 'A set of Python modules to automate the Microsoft Windows GUI',
     keywords = "windows gui automation GuiAuto testing test desktop mouse keyboard",
     url = "http://pywinauto.github.io/",