diff --git a/LICENSE.txt b/LICENSE.txt
index d91b95fe795772203ae9e9b650aafe7774404cba..b769f516e82b49ac587c082e0821e7add6c8eee9 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -238,8 +238,8 @@ Applications:
       Bundles systray4j-2.4.1:
       See licenses/LICENSE-LGPLv2.1.txt
 
-   Tomcat 6.0.35:
-   Copyright 1999-2011 The Apache Software Foundation
+   Tomcat 6.0.36:
+   Copyright 1999-2012 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 
diff --git a/apps/jetty/apache-tomcat-deployer/NOTICE b/apps/jetty/apache-tomcat-deployer/NOTICE
index c44c35de8848e6dbe18ff5477c67694b74b19042..aaa19b6a8c8382fc1542021af67fa7b40ba5756e 100644
--- a/apps/jetty/apache-tomcat-deployer/NOTICE
+++ b/apps/jetty/apache-tomcat-deployer/NOTICE
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2011 The Apache Software Foundation
+Copyright 1999-2012 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/apps/jetty/apache-tomcat-deployer/README-i2p.txt b/apps/jetty/apache-tomcat-deployer/README-i2p.txt
index dd398113861368996037f52c137ce55db6445a44..5a0568444a76b401ca449db17ce9f08318456c01 100644
--- a/apps/jetty/apache-tomcat-deployer/README-i2p.txt
+++ b/apps/jetty/apache-tomcat-deployer/README-i2p.txt
@@ -2,7 +2,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
 The Glassfish JSP 2.1 bundled in Jetty 6 is way too old.
 
 Retrieved from the file
-	apache-tomcat-6.0.35-deployer.tar.gz
+	apache-tomcat-6.0.36-deployer.tar.gz
 
 minus the following files and directores:
 
diff --git a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar
index 3518f7d76b3b83fc0ae8f660079439d7c68a27e0..7503cdabddd5f10328f7f80fed35d5c091c12009 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar and b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar
index 23876732eeb471c2d620ab485745086e5b9e1269..c51e275e2f1a1731d3ff71f662671a10397ad2c7 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar
index e64284f4f625353e50e1f2956261e1fb515de529..47284070c277533f3cdab32ca0b2fd63800a3a0d 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/jsp-api.jar b/apps/jetty/apache-tomcat-deployer/lib/jsp-api.jar
index 6ef6574cea37f17321800b1921f18e6ab63d47fd..3030459542bceaa1c7705a015c840b215eceef23 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/jsp-api.jar and b/apps/jetty/apache-tomcat-deployer/lib/jsp-api.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/servlet-api.jar b/apps/jetty/apache-tomcat-deployer/lib/servlet-api.jar
index 1bf50af6e504fff15c5a3ad31b773b12aedee16d..44f490c6af297ea457d6126864327ae1f58cfaa9 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/servlet-api.jar and b/apps/jetty/apache-tomcat-deployer/lib/servlet-api.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar
index 07571768cafb3948f98eb0b1d3ac5fa01393875d..2fcbafd9de994260a4ca36dbc356121e370f31ef 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar and b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar differ