Release version 1.5.4
diff --git a/CHANGES.txt b/CHANGES.txt
index 3baef5e..479ba1f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,8 +2,8 @@
 =========
 
 
-1.x (unreleased)
-----------------
+1.5.4 (2014-04-07)
+------------------
 
 * Fix negative offset with E303 before a multi-line docstring.
   (Issue #269)
diff --git a/pep8.py b/pep8.py
index fa8f8d9..4662cd7 100755
--- a/pep8.py
+++ b/pep8.py
@@ -46,7 +46,7 @@
 """
 from __future__ import with_statement
 
-__version__ = '1.5.4a0'
+__version__ = '1.5.4'
 
 import os
 import sys