diff -u tomcat6-6.0.18/debian/rules tomcat6-6.0.18/debian/rules
--- tomcat6-6.0.18/debian/rules
+++ tomcat6-6.0.18/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/quilt/quilt.make
 
-JAVA_HOME := /usr/lib/jvm/default-java
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 JAVA_CMD := $(JAVA_HOME)/bin/java
 BLDLIB := output/build/lib
 DEB_JARS_BASE := /usr/share/java
diff -u tomcat6-6.0.18/debian/changelog tomcat6-6.0.18/debian/changelog
--- tomcat6-6.0.18/debian/changelog
+++ tomcat6-6.0.18/debian/changelog
@@ -1,3 +1,22 @@
+tomcat6 (6.0.18-0ubuntu3.3~hardy1) hardy-backports; urgency=low
+
+  [ Michael Jeanson ]
+  * Source backport for Hardy backports (LP: #271784)
+  * debian/control:
+    - Changed dependency on default-jdk to openjdk-6-jdk
+    - Changed dependency on default-jre-headless to openjdk-6-jre-headless
+  * debian/rules:
+    - Adjusted JAVA_HOME for openjdk-6-jdk
+
+  [ Michael Casadevall ]
+  * Updated diff to apply against intrepid-security 6.0.18-0ubuntu3.2
+
+  [ Evan Broder ]
+  * Updated diff to apply against intrepid-security 6.0.18-0ubuntu3.3 (LP:
+    #897383)
+
+ -- Evan Broder <evan@ebroder.net>  Mon, 28 Nov 2011 12:07:34 -0800
+
 tomcat6 (6.0.18-0ubuntu3.3) intrepid-security; urgency=low
 
   * SECURITY UPDATE: arbitrary file creation or overwrite from directory
diff -u tomcat6-6.0.18/debian/control tomcat6-6.0.18/debian/control
--- tomcat6-6.0.18/debian/control
+++ tomcat6-6.0.18/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-debian@home.paulcager.org>
-Build-Depends: default-jdk,
+Build-Depends: openjdk-6-jdk,
 	ant,
 	ant-optional,
 	debhelper (>=6),
@@ -50,7 +50,7 @@
 
 Package: libtomcat6-java
 Architecture: all
-Depends: default-jre-headless | java6-runtime-headless,
+Depends: openjdk-6-jre-headless | java6-runtime-headless,
 	libecj-java,
 	libcommons-dbcp-java,
 	libcommons-pool-java,
@@ -65,7 +65,7 @@
 
 Package: libservlet2.5-java
 Architecture: all
-Depends: default-jre-headless | java2-runtime-headless
+Depends: openjdk-6-jre-headless | java2-runtime-headless
 Description: Servlet 2.5 and JSP 2.1 Java API classes and documentation
  For more information about Java servlets please take a look at the Tomcat
  home page at http://jakarta.apache.org/tomcat/index.html.