diff --git a/CHANGES.rst b/CHANGES.rst
index 1c57d24..6c91534 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,7 @@
+0.5.12 (2018-12-18)
+-------------------
+- Fix tables with gridSpan that have less cells after the tc forloop (#164)
+
 0.5.11 (2018-11-21)
 -------------------
 - Smart double quotes in jinja tags are now converted into simple double quotes
diff --git a/docxtpl/__init__.py b/docxtpl/__init__.py
index f968fdf..1f57b24 100644
--- a/docxtpl/__init__.py
+++ b/docxtpl/__init__.py
@@ -6,7 +6,7 @@ Created : 2015-03-12
 '''
 import functools
 
-__version__ = '0.5.11'
+__version__ = '0.5.12'
 
 from lxml import etree
 from docx import Document