diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt
index 64e4ceb8e..16000ccaf 100644
--- a/Shorewall-common/changelog.txt
+++ b/Shorewall-common/changelog.txt
@@ -12,6 +12,8 @@ Changes in 4.0.1
 
 6)  Relax ADDRTYPE restriction.
 
+7)  Be sure that chkconfig runs after upgrade from < 4.0.0
+
 Changes in 4.0.0 Final
 
 1)  Fix lite install.sh manpage problem.
diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index bf2045fd5..f411627d8 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -69,6 +69,10 @@ Problems corrected in 4.0.1.
     the /etc/shorewall/ecn file would cause invalid iptables commands
     to be generated. This problem occurred with both compilers.
 
+8)  Shorewall now starts at reboot after an upgrade from shorewall <
+    4.0.0. Previously, Shorewall was not started automatically after an
+    upgrade using the RPM.
+
 Other changes in Shorewall 4.0.1.
 
 1)  A new EXPAND_POLICIES option is added to shorewall.conf. The
@@ -662,6 +666,10 @@ Migration Considerations:
 	invocation are automatically propagated to lower level macros.
 
 	 Macro invocations may be nested to a maximum level of 5.
+
+     w) The PKTTYPE option is ignored by Shorewall-perl. Shorewall-perl 
+        will use Address type match if it is available; otherwise, it 
+	will behave as if PKTTYPE=No had been specified.
     ------------------------------------------------------------------------
                       P R E R E Q U I S I T E S
     ------------------------------------------------------------------------
diff --git a/Shorewall-common/shorewall-common.spec b/Shorewall-common/shorewall-common.spec
index 235d9e4e8..f5589eb24 100644
--- a/Shorewall-common/shorewall-common.spec
+++ b/Shorewall-common/shorewall-common.spec
@@ -65,6 +65,14 @@ if [ $1 = 0 ]; then
 
 fi
 
+%triggerpostun  -- shorewall < 4.0.0
+
+if [ -x /sbin/insserv ]; then
+    /sbin/insserv /etc/rc.d/shorewall
+elif [ -x /sbin/chkconfig ]; then
+    /sbin/chkconfig --add shorewall;
+fi
+
 %files
 %defattr(0644,root,root,0755)
 %attr(0544,root,root) /etc/init.d/shorewall