diff --git a/apps/jetty/apache-tomcat-deployer/README-i2p.txt b/apps/jetty/apache-tomcat-deployer/README-i2p.txt
index 5a0568444a76b401ca449db17ce9f08318456c01..cc175380c09c583eda1acaf895f687188bc308c7 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.36-deployer.tar.gz
+	apache-tomcat-6.0.37-deployer.tar.gz
 
 minus the following files and directores:
 
diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch
index c9fe1e903f7f92d6242f1017620517530b17ce36..b971f404a61187b87396d72b4603fb8147e4dd88 100644
--- a/debian/patches/0001-path-substitution.patch
+++ b/debian/patches/0001-path-substitution.patch
@@ -71,7 +71,14 @@ Debian wrapper.config to try to prevent confusion.
  
  # Priority at which to run the wrapper.  See "man nice" for valid priorities.
  #  nice is only used if a priority is specified.
-@@ -172,64 +163,6 @@
+@@ -167,69 +158,13 @@
+ 
+ # Do not modify anything beyond this point
+ #-----------------------------------------------------------------------------
++JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
++
+ if [ ! -e "$WRAPPER_CONF" ]; then
+        echo "Starting I2P Failed: Unable to find $WRAPPER_CONF"
         exit 1
  fi
  
@@ -136,7 +143,7 @@ Debian wrapper.config to try to prevent confusion.
  if [ -n "$FIXED_COMMAND" ]
  then
      COMMAND="$FIXED_COMMAND"
-@@ -940,7 +873,7 @@
+@@ -940,7 +875,7 @@
  
          # The string passed to eval must handles spaces in paths correctly.
          COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.20 $ADDITIONAL_PARA"
@@ -145,7 +152,7 @@ Debian wrapper.config to try to prevent confusion.
      else
          eval echo `gettext '$APP_LONG_NAME is already running.'`
          exit 1
-@@ -997,7 +930,6 @@
+@@ -997,7 +932,6 @@
          if [ "X$pid" = "X" ]
          then
              eval echo " `gettext 'WARNING: $APP_LONG_NAME may have failed to start.'`"
@@ -153,7 +160,7 @@ Debian wrapper.config to try to prevent confusion.
          else
              eval echo ' running: PID:$pid'
          fi
-@@ -1800,7 +1732,7 @@
+@@ -1800,7 +1734,7 @@
  }
  
  showsetusermesg()  {
@@ -162,7 +169,7 @@ Debian wrapper.config to try to prevent confusion.
  }
  
  checkifstartingasroot() {
-@@ -1808,7 +1740,7 @@
+@@ -1808,7 +1742,7 @@
          echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
          showsetusermesg
          echo
@@ -171,7 +178,7 @@ Debian wrapper.config to try to prevent confusion.
          exit 1
      fi
  }
-@@ -1873,24 +1805,10 @@
+@@ -1873,24 +1807,10 @@
              status
              ;;