diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2cf4bd9..626981ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## master (unreleased)
 
+## 5.4.0 (2016-05-21)
+
 ### New features
 
 * When aligning forms with `clojure-align` (or with the automatic align feature), blank lines will divide alignment regions.
diff --git a/clojure-mode.el b/clojure-mode.el
index b8dbaab9..32778e6d 100644
--- a/clojure-mode.el
+++ b/clojure-mode.el
@@ -10,7 +10,7 @@
 ;;       Artur Malabarba <bruce.connor.am@gmail.com>
 ;; URL: http://github.com/clojure-emacs/clojure-mode
 ;; Keywords: languages clojure clojurescript lisp
-;; Version: 5.3.0
+;; Version: 5.4.0
 ;; Package-Requires: ((emacs "24.3"))
 
 ;; This file is not part of GNU Emacs.
@@ -78,7 +78,7 @@
   :link '(url-link :tag "Github" "https://github.com/clojure-emacs/clojure-mode")
   :link '(emacs-commentary-link :tag "Commentary" "clojure-mode"))
 
-(defconst clojure-mode-version "5.3.0"
+(defconst clojure-mode-version "5.4.0"
   "The current version of `clojure-mode'.")
 
 (defface clojure-keyword-face