diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index 4439bb12bc90b4c35da18a9b50b48c069cb8b185..25243e231689d37293a4b90393fd802ddcbf836f 100755
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -126,7 +126,7 @@ TEXT_VER="1.1.0.1";    TEXT_VER_REGEXP="((1\.[01]\.)|(0\.([2-9]|(1[0-1]))\.))"
                        # >= 0.2 && < 1.2
 NETWORK_VER="2.4.2.3"; NETWORK_VER_REGEXP="2\.[0-5]\."
                        # >= 2.0 && < 2.6
-CABAL_VER="1.20.0.3";  CABAL_VER_REGEXP="1\.2[01]\."
+CABAL_VER="1.20.0.4";  CABAL_VER_REGEXP="1\.2[01]\."
                        # >= 1.20 && < 1.21
 TRANS_VER="0.3.0.0";   TRANS_VER_REGEXP="0\.[23]\."
                        # >= 0.2.* && < 0.4.*
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index d45082e065233e144b6f126296a18a258d31eb3d..551f036519648ddff2c5c080b3e2a144121b9b5a 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -1,5 +1,5 @@
 Name:               cabal-install
-Version:            1.20.1.0
+Version:            1.20.2.0
 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 f564a0ab6aa13928dcb986153ff9e160e2c9b898..f65b2698fe55042824f2c2108cb231f21cc2d990 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,4 +1,8 @@
 -*-change-log-*-
+1.20.2.0 Ryan Thomas <ryan@ryant.org> February 2016
+	* Only Custom setup scripts should be compiled with '-i -i.'.
+	* installedCabalVersion: Don't special-case Cabal anymore.
+
 1.20.1.0 Ryan Thomas <ryan@ryant.org> May 2015
 	* Force cabal upload to always use digest auth and never basic auth.
 	* bootstrap.sh: install network-uri before HTTP