diff --git a/pkgs/development/compilers/abc/default.nix b/pkgs/development/compilers/abc/default.nix
index 0dd7b94a7bc..fbbf2479ea4 100644
--- a/pkgs/development/compilers/abc/default.nix
+++ b/pkgs/development/compilers/abc/default.nix
@@ -3,12 +3,12 @@
 let { 
   body =
     stdenv.mkDerivation {
-      name = "abc-1.1.1";
+      name = "abc-1.2.0";
       builder = ./builder.sh;
 
       src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.1.1/files/abc-1.1.1-src.tar.gz;
-        md5 = "6479e151d0a00633f7aa7c31c93c439e";
+        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz;
+        md5 = "aef9e8eac860f904f2a841e18770dc47";
       };
 
       inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd patches;
@@ -35,7 +35,7 @@ let {
       jarname = "jedd.runtime";
       builder = ./builder-binjar.sh;
       src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.1.1/files/lib/jedd-runtime-snapshot.jar;
+        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/jedd-runtime-snapshot.jar;
         md5 = "595c5ac2f6384f4c34f1854891b5e422";
       };
     };
@@ -46,7 +46,7 @@ let {
       jarname = "javabdd";
       builder = ./builder-binjar.sh;
       src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.1.1/files/lib/javabdd_0.6.jar;
+        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/javabdd_0.6.jar;
         md5 = "6e0246e891b7431f4e7265b5b1471307";
       };
     };
@@ -57,7 +57,7 @@ let {
       jarname = "paddle";
       builder = ./builder-binjar.sh;
       src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.1.1/files/lib/paddle-snapshot.jar;
+        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/paddle-snapshot.jar;
         md5 = "a8e032310137945124a2850cd8cfc277";
       };
     };
@@ -68,7 +68,7 @@ let {
       jarname = "xact";
       builder = ./builder-binjar.sh;
       src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.0.2/files/lib/xact-complete-1.0-1.jar;
+        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/xact-complete-1.0-1.jar;
         md5 = "9810ad8762101ea691a895f0a6b7a5c3";
       };
     };
diff --git a/pkgs/development/compilers/abc/jasmin/builder.sh b/pkgs/development/compilers/abc/jasmin/builder.sh
index 100f9bdd04f..b591b60c56a 100644
--- a/pkgs/development/compilers/abc/jasmin/builder.sh
+++ b/pkgs/development/compilers/abc/jasmin/builder.sh
@@ -3,6 +3,9 @@ source $stdenv/setup
 tar zxvf $src  || fail
 cd jasmin-*  || fail
 
+sed -e 's/<javac/<javac source="1.4"/' build.xml > build-tmp.xml
+mv build-tmp.xml build.xml
+
 cat > ant.settings <<EOF
 java_cup.jar=$javaCup
 
@@ -11,9 +14,11 @@ release.loc=lib
 
 # Version of Jasmin for tagging tarballs
 jasmin.version=foo
+
+build.compiler=javac1.4
 EOF
 
-$apacheAnt/bin/ant jasmin-jar || fail
+ant jasmin-jar || fail
 
 ensureDir $out/jars/ || fail
 mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar || fail
diff --git a/pkgs/development/compilers/abc/jasmin/default.nix b/pkgs/development/compilers/abc/jasmin/default.nix
index 48a54366510..0c93e5893a5 100644
--- a/pkgs/development/compilers/abc/jasmin/default.nix
+++ b/pkgs/development/compilers/abc/jasmin/default.nix
@@ -1,13 +1,14 @@
 {stdenv, fetchurl, apacheAnt, javaCup}:
 
 stdenv.mkDerivation {
-  name = "jasmin-dev-20060319162437";
+  name = "jasmin-dev-20060422015512";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://abc.comlab.ox.ac.uk/dists/1.1.1/files/jasmin-dev-20060319162437.tar.gz;
-    md5 = "d161d647ef727335cb1d15976a5e3011";
+    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/jasmin-dev-20060422015512.tar.gz;
+    md5 = "0e49e532b4658c959582c5d5b5e28bf1";
   };
 
-  inherit apacheAnt javaCup;
+  inherit javaCup;
+  buildInputs = [apacheAnt];
 }
diff --git a/pkgs/development/compilers/abc/polyglot/builder.sh b/pkgs/development/compilers/abc/polyglot/builder.sh
index e00ba976b99..197d1680914 100644
--- a/pkgs/development/compilers/abc/polyglot/builder.sh
+++ b/pkgs/development/compilers/abc/polyglot/builder.sh
@@ -3,8 +3,8 @@ source $stdenv/setup
 tar zxvf $src  || fail
 cd polyglot-*  || fail
 
-$apacheAnt/bin/ant polyglot-jar || fail
-$apacheAnt/bin/ant cup || fail
+ant polyglot-jar || fail
+ant cup || fail
 
 ensureDir $out/jars/ || fail
 mv lib/java_cup.jar $out/jars/ || fail
diff --git a/pkgs/development/compilers/abc/polyglot/default.nix b/pkgs/development/compilers/abc/polyglot/default.nix
index d45aa3ffe4b..99ca28d0455 100644
--- a/pkgs/development/compilers/abc/polyglot/default.nix
+++ b/pkgs/development/compilers/abc/polyglot/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, apacheAnt}:
 
 stdenv.mkDerivation {
-  name = "polyglot-dev-20060319162437";
+  name = "polyglot-dev-20060422015512";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://abc.comlab.ox.ac.uk/dists/1.1.1/files/polyglot-dev-20060319162437.tar.gz;
-    md5 = "c6c29535e33f3055b7bc8f39f5acf00d";
+    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/polyglot-dev-20060422015512.tar.gz;
+    md5 = "6972fe537b4edd41872ed1cf24d24b50";
   };
 
-  inherit apacheAnt;
+  buildInputs = [apacheAnt];
 }
diff --git a/pkgs/development/compilers/abc/soot/builder.sh b/pkgs/development/compilers/abc/soot/builder.sh
index fea9448160c..732a8d20e15 100644
--- a/pkgs/development/compilers/abc/soot/builder.sh
+++ b/pkgs/development/compilers/abc/soot/builder.sh
@@ -3,6 +3,8 @@ source $stdenv/setup
 tar zxvf $src  || fail
 cd soot-*  || fail
 
+export NIX_ANT_OPTS="$ANT_OPTS -Xmx200m"
+
 cat > ant.settings <<EOF
 polyglot.jar=$polyglot/jars/polyglot.jar
 jasmin.jar=$jasmin/jars/jasmin.jar
@@ -11,7 +13,7 @@ release.loc=lib
 javaapi.url=http://java.sun.com/j2se/1.4.2/docs/api/
 EOF
 
-$apacheAnt/bin/ant classesjar || fail
+ant classesjar || fail
 
 ensureDir $out/jars/ || fail
 mv lib/sootclasses-foo.jar $out/jars/soot.jar || fail
diff --git a/pkgs/development/compilers/abc/soot/default.nix b/pkgs/development/compilers/abc/soot/default.nix
index 48b1b46d6dc..818d2bde624 100644
--- a/pkgs/development/compilers/abc/soot/default.nix
+++ b/pkgs/development/compilers/abc/soot/default.nix
@@ -1,13 +1,14 @@
 {stdenv, fetchurl, apacheAnt, polyglot, jasmin}:
 
 stdenv.mkDerivation {
-  name = "soot-dev-20060319162437";
+  name = "soot-dev-20060422015512";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://abc.comlab.ox.ac.uk/dists/1.1.1/files/soot-dev-20060319162437.tar.gz;
-    md5 = "5657edcb5de974514f151aca37112630";
+    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/soot-dev-20060422015512.tar.gz;
+    md5 = "20dae3e31215b7ec88e3ff32a107d713";
   };
 
-  inherit apacheAnt polyglot jasmin;
+  inherit polyglot jasmin;
+  buildInputs = [apacheAnt];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2788f47fd91..3b3b970e12b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -763,8 +763,8 @@ rec {
 
   abcPatchable = patches : 
     (import ../development/compilers/abc/default.nix) {
-      inherit stdenv fetchurl patches jre;
-      apacheAnt = apacheAntBlackdown14;
+      inherit stdenv fetchurl patches jre apacheAnt;
+      # apacheAnt = apacheAntBlackdown14;
       javaCup = import ../development/libraries/java/cup {
         inherit stdenv fetchurl;
         jdk = blackdown;
@@ -956,6 +956,11 @@ rec {
     inherit fetchurl stdenv jikes alsaLib xlibs;
   };
 
+  apacheAnt = (import ../development/tools/build-managers/apache-ant) {
+    inherit fetchurl stdenv jdk;
+    name = "ant-jdk-1.5.0";
+  };
+
   apacheAnt14 = (import ../development/tools/build-managers/apache-ant) {
     inherit fetchurl stdenv;
     jdk = j2sdk14x;
@@ -968,11 +973,6 @@ rec {
     name = "ant-blackdown-1.4.2";
   };
 
-  apacheAnt = (import ../development/tools/build-managers/apache-ant) {
-    inherit fetchurl stdenv jdk;
-    name = "ant-jdk-1.5.0";
-  };
-
   dovecot = (import ../servers/mail/dovecot) {
     inherit fetchurl stdenv ;
   };