diff --git a/CHANGES.rst b/CHANGES.rst
index 87294fd91..fbcbc18f3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,8 +1,9 @@
 Changes
 =======
 
-tip (unreleased)
-----------------
+1.5.4 (2015-01-03)
+------------------
+- Fix a bug when models have a ``ForeignKey`` with ``primary_key=True``
 - Do NOT delete the history elements when a user is deleted.
 - Add support for ``latest``
 
diff --git a/simple_history/__init__.py b/simple_history/__init__.py
index 53deaa1b0..7004da883 100755
--- a/simple_history/__init__.py
+++ b/simple_history/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-__version__ = '1.5.3'
+__version__ = '1.5.4'
 
 
 def register(