diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 4c4d0bcf305bc658e3f1bd2ec952aa4f3bfd2f04..5fd137a69dac3b69dc0a7dc41956de40279c4cde 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -1,5 +1,5 @@
 Name:               cabal-install
-Version:            1.18.0.3
+Version:            1.18.0.4
 Synopsis:           The command-line interface for Cabal and Hackage.
 Description:
     The \'cabal\' command-line program simplifies the process of managing
diff --git a/cabal-install/changelog b/cabal-install/changelog
index 28881602514e5bf3f5cb83058928ed562c710cc7..1896cad94014cc67dd8581d751b8d54b4c91cb30 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,5 +1,10 @@
 -*-change-log-*-
 
+1.18.0.4 Johan Tibell <johan.tibell@gmail.com> May 2014
+	* Increase max-backjumps to 2000.
+	* Fix solver bug which led to missed install plans.
+	* Tweak solver heuristics to avoid reinstalls.
+
 0.14.0 Andres Loeh <andres@well-typed.com> April 2012
 	* Works with ghc-7.4
 	* Completely new modular dependency solver (default in most cases)