diff --git a/Cabal/Makefile b/Cabal/Makefile
index dfc168b7b4f8940c9a9f11138f9f303312002fef..f319ced59a5b6a6200eb43ec921cd23aafb7dcbd 100644
--- a/Cabal/Makefile
+++ b/Cabal/Makefile
@@ -8,7 +8,7 @@ KIND=rc
 PREFIX=/usr/local
 HC=ghc
 GHCFLAGS=-Wall -threaded
-SSH_USER=$USER
+SSH_USER=tibbe
 
 all: build
 
diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index 5d2a7b6d84931e8cf2a5dcdc2208b8d0f4d14488..493433b1dfa16215a901fc34add9265555ba30f0 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.0";  CABAL_VER_REGEXP="1\.2[01]\."
+CABAL_VER="1.20.0.3";  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 4356a7a9cacf668f890081921f4698e2a688db86..5dd146224bb543eeb82333776f390c0423579c97 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -1,5 +1,5 @@
 Name:               cabal-install
-Version:            1.20.0.3
+Version:            1.20.0.4
 Synopsis:           The command-line interface for Cabal and Hackage.
 Description:
     The \'cabal\' command-line program simplifies the process of managing