diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/5.0.nix
similarity index 100%
rename from pkgs/servers/http/tomcat/default.nix
rename to pkgs/servers/http/tomcat/5.0.nix
diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix
index 256612f94fc..317634d9ab4 100644
--- a/pkgs/servers/http/tomcat/6.0.nix
+++ b/pkgs/servers/http/tomcat/6.0.nix
@@ -1,15 +1,23 @@
-{stdenv, fetchurl, jdk}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
+let version = "6.0.29"; in
 
-  name = "apache-tomcat-6.0.26";
-
-  builder = ./builder-6.0.sh;
+stdenv.mkDerivation rec {
+  name = "apache-tomcat-${version}";
 
   src = fetchurl {
-    url = http://apache.proserve.nl/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz;
-    sha256 = "0rxaz7wkw6xas9f2jslb6kp1prllhpqmq7c3h0ig19j146mrjbls";
+    url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz";
+    sha256 = "0v96wmd4fnk3qskw32k8mb77f7yssqqinsrf9sir672l5ggmmcjc";
   };
 
-  inherit jdk;
+  installPhase =
+    ''
+      mkdir $out
+      mv * $out
+    '';
+
+  meta = {
+    homepage = http://tomcat.apache.org/;
+    description = "An implementation of the Java Servlet and JavaServer Pages technologies";
+  };
 }
diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh
deleted file mode 100644
index bcb56ee61d8..00000000000
--- a/pkgs/servers/http/tomcat/builder-6.0.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-tar zxf $src
-
-mkdir $out
-mv apache-tomcat-*/* $out
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6172838474a..cbaffc631a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4241,7 +4241,7 @@ let
   });
   squid = squids.squid3Beta; # has ipv6 support
 
-  tomcat5 = callPackage ../servers/http/tomcat { };
+  tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
 
   tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };