diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh
index 8b063ebfbfd..001fade3880 100644
--- a/pkgs/servers/http/tomcat/builder-6.0.sh
+++ b/pkgs/servers/http/tomcat/builder-6.0.sh
@@ -4,5 +4,10 @@ tar zxf $src
 
 mkdir $out
 mv apache-tomcat*/* $out
+
+# Rename the context.xml to context.xml.default in order to allow a custom context.xml
+mv $out/conf/context.xml $out/conf/context.xml.default
+
+# Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
 sed -i -e 's|${catalina.home}|${catalina.base}|g' \
        -e 's|shared.loader=|shared.loader=${catalina.base}/shared/lib/*.jar|' $out/conf/catalina.properties