diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix
index 32a3dedde472..7ab5ebcb3b3a 100644
--- a/pkgs/servers/http/tomcat/6.0.nix
+++ b/pkgs/servers/http/tomcat/6.0.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation {
 
-  name = "apache-tomcat-6.0.14";
+  name = "apache-tomcat-6.0.16";
 
   builder = ./builder-6.0.sh;
 
   src = fetchurl {
-    url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.14/bin/apache-tomcat-6.0.14.tar.gz;
-    md5 = "3b18ff250d8172737c4f67f11631f68a";
+    url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16.tar.gz;
+    md5 = "4985fed02341a9e04ea43e91e6444ace";
   };
 
   inherit jdk;
diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh
index ae2f934af596..040d45171e31 100644
--- a/pkgs/servers/http/tomcat/builder-6.0.sh
+++ b/pkgs/servers/http/tomcat/builder-6.0.sh
@@ -4,3 +4,4 @@ tar zxf $src
 
 mkdir $out
 mv apache-tomcat*/* $out
+sed -i -e 's|shared.loader=|shared.loader=${catalina.home}/shared/lib/*.jar|' $out/conf/catalina.properties