diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh
index 6f3624cd20cc..8b063ebfbfd3 100644
--- a/pkgs/servers/http/tomcat/builder-6.0.sh
+++ b/pkgs/servers/http/tomcat/builder-6.0.sh
@@ -4,4 +4,5 @@ tar zxf $src
 
 mkdir $out
 mv apache-tomcat*/* $out
-sed -i -e 's|shared.loader=|shared.loader=${catalina.base}/shared/lib/*.jar|' $out/conf/catalina.properties
+sed -i -e 's|${catalina.home}|${catalina.base}|g' \
+       -e 's|shared.loader=|shared.loader=${catalina.base}/shared/lib/*.jar|' $out/conf/catalina.properties
diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh b/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh
index b02e0f49dfde..4a7248dfc8d5 100644
--- a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh
+++ b/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh
@@ -1,4 +1,4 @@
 source $stdenv/setup
 
-ensureDir $out/shared/lib
-ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/shared/lib/mysql-connector-java.jar
+ensureDir $out/lib
+ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar