diff --git a/tomcat.spec b/tomcat.spec
index 832f606..84b8203 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -504,9 +504,11 @@ EOF
 
 %preun
 # clean tempdir and workdir on removal or upgrade
-%{_initrddir}/%{name} stop >/dev/null 2>&1
-/sbin/chkconfig --del %{name}
 %{__rm} -rf %{workdir}/* %{tempdir}/*
+if [ "$1" = "0" ]; then
+    %{_initrddir}/%{name} stop >/dev/null 2>&1
+    /sbin/chkconfig --del %{name}
+fi
 
 %postun jsp-%{jspspec}-api
 if [ "$1" = "0" ]; then
@@ -646,6 +648,7 @@ fi
 - Resolves: rhbz#1104704 /usr/sbin/tomcat overrides settings specified in /etc/sysconfig/${NAME}
 - Resolves: rhbz#1364067 The tomcat-tool-wrapper script is broken
 - Resolves: rhbz#1364068 The command tomcat-digest doesn't work
+- Resolves: rhbz#1311499 Updating package causes tomcat to not start on boot
 
 * Fri Nov 13 2015 Coty Sutherland <csutherl@redhat.com> 0:7.0.65-1
 - Updated to 7.0.65