diff --git a/tomcat6-6.0.conf b/tomcat6-6.0.conf
index 668f81a..f2fe56e 100644
--- a/tomcat6-6.0.conf
+++ b/tomcat6-6.0.conf
@@ -9,7 +9,7 @@
 #
 
 # Where your java installation lives
-JAVA_HOME="/usr/lib/jvm/java-1.6.0"
+JAVA_HOME="/usr/lib/jvm/jre"
 
 # Where your tomcat installation lives
 CATALINA_BASE="@@@TCHOME@@@"
diff --git a/tomcat6.spec b/tomcat6.spec
index 575bc7e..f90861d 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -566,6 +566,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Mon Feb 28 2011 David Knox <dknox@redhat.com> 0:6.0.32-2
+- Resolves rhbz 640134 - setting JAVA_HOME
+
 * Mon Feb 28 2011 David Knox <dknox@redhat.com> 0:6.0.32-1
 - Rebase on 6.0.32 with several bug fixes and security fixes
 - changed apache-commons to jakarta-commons to fix missing