diff -Nru tomcat6-6.0.24/debian/changelog tomcat6-6.0.24/debian/changelog
--- tomcat6-6.0.24/debian/changelog	2010-03-31 09:52:29.000000000 +0100
+++ tomcat6-6.0.24/debian/changelog	2010-06-09 22:41:36.000000000 +0100
@@ -1,3 +1,10 @@
+tomcat6 (6.0.24-2ubuntu2) lucid; urgency=low
+
+  * Fixing failure to start with security manager enable (Closes: LP: #591802) 
+    Thanks to Jeff Turner for patches
+
+ -- Adam Guthrie <asguthrie@gmail.com>  Wed, 09 Jun 2010 22:40:11 +0100
+
 tomcat6 (6.0.24-2ubuntu1) lucid; urgency=low
 
   [ Thierry Carrez ]
diff -Nru tomcat6-6.0.24/debian/patches/debian-changes-6.0.24-2ubuntu2 tomcat6-6.0.24/debian/patches/debian-changes-6.0.24-2ubuntu2
--- tomcat6-6.0.24/debian/patches/debian-changes-6.0.24-2ubuntu2	1970-01-01 01:00:00.000000000 +0100
+++ tomcat6-6.0.24/debian/patches/debian-changes-6.0.24-2ubuntu2	2010-06-09 23:12:45.000000000 +0100
@@ -0,0 +1,55 @@
+Description: Upstream changes introduced in version 6.0.24-2ubuntu2
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ tomcat6 (6.0.24-2ubuntu2) lucid; urgency=low
+ .
+   * Fixing failure to start with security manager enable (Closes: LP: #591802)
+     Thanks to Jeff Turner for patches
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Adam Guthrie <asguthrie@gmail.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/591802
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- tomcat6-6.0.24.orig/bin/catalina.sh
++++ tomcat6-6.0.24/bin/catalina.sh
+@@ -261,7 +261,7 @@ if [ "$1" = "debug" ] ; then
+         -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+         -sourcepath "$CATALINA_HOME"/../../java \
+         -Djava.security.manager \
+-        -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
++        -Djava.security.policy=="$CATALINA_BASE"/work/catalina.policy \
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+@@ -288,7 +288,7 @@ elif [ "$1" = "run" ]; then
+     exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
+       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+       -Djava.security.manager \
+-      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
++      -Djava.security.policy=="$CATALINA_BASE"/work/catalina.policy \
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+@@ -321,7 +321,7 @@ elif [ "$1" = "start" ] ; then
+     "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
+       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+       -Djava.security.manager \
+-      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
++      -Djava.security.policy=="$CATALINA_BASE"/work/catalina.policy \
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
diff -Nru tomcat6-6.0.24/debian/patches/series tomcat6-6.0.24/debian/patches/series
--- tomcat6-6.0.24/debian/patches/series	2010-03-25 10:22:10.000000000 +0000
+++ tomcat6-6.0.24/debian/patches/series	2010-06-09 23:02:06.000000000 +0100
@@ -7,3 +7,4 @@
 servlet-api-OSGi.patch
 jsp-api-OSGi.patch
 allow-empty-pid-file.patch
+debian-changes-6.0.24-2ubuntu2
diff -Nru tomcat6-6.0.24/debian/tomcat6.init tomcat6-6.0.24/debian/tomcat6.init
--- tomcat6-6.0.24/debian/tomcat6.init	2010-03-25 22:12:33.000000000 +0000
+++ tomcat6-6.0.24/debian/tomcat6.init	2010-06-09 22:37:23.000000000 +0100
@@ -107,7 +107,6 @@
 
 SECURITY=""
 if [ "$TOMCAT6_SECURITY" = "yes" ]; then
-	JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=\"$POLICY_CACHE\""
 	SECURITY="-security"
 fi