diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index e4e9517..4123f1c 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -38,9 +38,9 @@ fi
 
 # For SELinux we need to use 'runuser' not 'su'
 if [ -x "/sbin/runuser" ]; then
-    SU="/sbin/runuser"
+    SU="/sbin/runuser -s /bin/sh"
 else
-    SU="/bin/su"
+    SU="/bin/su -s /bin/sh"
 fi
 
 # Get the tomcat config (use this for environment specific settings)
diff --git a/tomcat6.spec b/tomcat6.spec
index 2b79798..06c1f98 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -599,6 +599,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Thu Oct 07 2010 David Knox <dknox@redhat.com> 0L6.0.26-11
+- resolves rhbz#640837 - tomcat user requires login shell
+
 * Mon Oct 04 2010 David Knox <dknox@redhat.com> 0:6.0.26-10
 - ant-nodeps is breaking the build. Put ant-nodeps on the 
 - OPT_JAR_LIST