diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix
new file mode 100644
index 000000000000..070cc4071ad3
--- /dev/null
+++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "core-apache-ant-1.6.1";
+  realname = "apache-ant-1.6.1";
+
+  builder = ./core-builder.sh;
+  src = fetchurl {
+    url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.1-bin.tar.bz2;
+    md5 = "703d0265d05b98afd95be0bc21b98420";
+  };
+}
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
index 070cc4071ad3..a5fec1fdfd00 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "core-apache-ant-1.6.1";
-  realname = "apache-ant-1.6.1";
+  name = "core-apache-ant-1.6.2";
+  realname = "apache-ant-1.6.2";
 
   builder = ./core-builder.sh;
   src = fetchurl {
-    url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.1-bin.tar.bz2;
-    md5 = "703d0265d05b98afd95be0bc21b98420";
+    url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.2-bin.tar.bz2 ;
+    md5 = "a568c7271c3f168771c0313926d060fa";
   };
 }
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
index d7fffdabf00e..e06c6a2d2ca8 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
+++ b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
@@ -3,7 +3,7 @@
 # unpack the binary distribution
 tar jxf $src || exit 1
 mkdir -p $out
-mv apache-ant-1.6.1/* $out || exit 1
+mv apache-ant-*/* $out || exit 1
 
 # remove crap in the root directory
 
diff --git a/pkgs/servers/http/tomcat/builder.sh b/pkgs/servers/http/tomcat/builder.sh
new file mode 100644
index 000000000000..4678a878e416
--- /dev/null
+++ b/pkgs/servers/http/tomcat/builder.sh
@@ -0,0 +1,5 @@
+. $stdenv/setup || exit 1
+
+tar zxf $src
+mkdir $out
+mv jakarta-tomcat* $out
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
new file mode 100644
index 000000000000..cd61afb2d345
--- /dev/null
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+
+  name = "jakarta-tomcat-5.0.27";
+
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://apache.essentkabel.com/jakarta/tomcat-5/v5.0.27/bin/jakarta-tomcat-5.0.27.tar.gz;
+    md5 = "b802ee042677e284bcf65738c7bdc3b6";
+  };
+
+}
+
+
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 6dda81bf0287..386e40e96db7 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -384,9 +384,13 @@ rec {
     inherit fetchurl stdenv j2sdk;
   };
 
-  apacheant15 = (import ../development/tools/build-managers/apache-ant) {
+#  apacheant15 = (import ../development/tools/build-managers/apache-ant) {
+#    inherit fetchurl stdenv;
+#    j2sdk = j2sdk15;
+#  };
+
+  tomcat5 = (import ../servers/http/tomcat) {
     inherit fetchurl stdenv;
-    j2sdk = j2sdk15;
   };
 
   pcre = (import ../development/libraries/pcre) {