diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 1f461a765..58f3571bd 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -23,7 +23,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.4.11.4
+VERSION=4.4.11.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec
index 955a8a493..5c298c2ae 100644
--- a/Shorewall-init/shorewall-init.spec
+++ b/Shorewall-init/shorewall-init.spec
@@ -1,6 +1,6 @@
 %define name shorewall-init
 %define version 4.4.11
-%define release 4
+%define release 5
 
 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall).
 Name: %{name}
@@ -99,6 +99,8 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Sun Sep 12 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.11-5
 * Sat Aug 28 2010 Tom Eastep tom@shorewall.net
 - Updated to 4.4.11-4
 * Thu Aug 12 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh
index 509a4d318..526dac513 100755
--- a/Shorewall-init/uninstall.sh
+++ b/Shorewall-init/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=4.4.11.4
+VERSION=4.4.11.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 533ac7cf9..c7a57c28e 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.4.11.4
+VERSION=4.4.11.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index a375ba291..1e75d49e8 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -1,6 +1,6 @@
 %define name shorewall-lite
 %define version 4.4.11
-%define release 4
+%define release 5
 
 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
 Name: %{name}
@@ -102,6 +102,8 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Sun Sep 12 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.11-5
 * Sat Aug 28 2010 Tom Eastep tom@shorewall.net
 - Updated to 4.4.11-4
 * Thu Aug 12 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index 155a27634..5941c8177 100755
--- a/Shorewall-lite/uninstall.sh
+++ b/Shorewall-lite/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=4.4.11.4
+VERSION=4.4.11.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index fb44c796a..7909d0f3f 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -343,7 +343,7 @@ sub initialize( $ ) {
 		    EXPORT => 0,
 		    STATEMATCH => '-m state --state',
 		    UNTRACKED => 0,
-		    VERSION => "4.4.11.4",
+		    VERSION => "4.4.11.5",
 		    CAPVERSION => 40411 ,
 		  );
 
diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index d693b053c..9310bbcf1 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -1,3 +1,7 @@
+Changes in Shorewall 4.4.11.5
+
+1)  Fix SAME handling.
+
 Changes in Shorewall 4.4.11.4
 
 1)  Fix a couple of old optimization bugs.
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 525dcd9b3..059ff3e03 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.4.11.4
+VERSION=4.4.11.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/known_problems.txt b/Shorewall/known_problems.txt
index ebf756c40..ddeb1d558 100644
--- a/Shorewall/known_problems.txt
+++ b/Shorewall/known_problems.txt
@@ -117,3 +117,8 @@
     does not work correctly.
 
     Corrected in Shorewall 4.4.11.4.
+
+18) The SAME target in tcrules generates invalid iptables-restore
+    (ip6tables-restore) input.
+
+    Corrected in Shorewall 4.4.11.5.
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 40a792824..70d379c25 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -1,5 +1,5 @@
 ----------------------------------------------------------------------------
-                    S H O R E W A L L  4 . 4 . 1 1 . 4
+                    S H O R E W A L L  4 . 4 . 1 1 . 5
 ----------------------------------------------------------------------------
 
 I.    RELEASE 4.4 HIGHLIGHTS
@@ -218,6 +218,11 @@ VI.   PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
 I I I.  P R O B L E M S   C O R R E C T E D   I N   T H I S  R E L E A S E
 ----------------------------------------------------------------------------
 
+4.4.11.5
+
+1)  The SAME target in tcrules now generates correct iptables-restore
+    (ip6tables-restore) input.
+
 4.4.11.4
 
 1)  Under rare circumstances where COMMENT is used to attach comments
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 9c2e43f24..c66c9c492 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -1,6 +1,6 @@
 %define name shorewall
 %define version 4.4.11
-%define release 4
+%define release 5
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
 Name: %{name}
@@ -108,6 +108,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples
 
 %changelog
+* Sun Sep 12 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.11-5
 * Sat Aug 28 2010 Tom Eastep tom@shorewall.net
 - Updated to 4.4.11-4
 * Thu Aug 12 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index f4e2d5c5b..fb1af28c9 100755
--- a/Shorewall/uninstall.sh
+++ b/Shorewall/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=4.4.11.4
+VERSION=4.4.11.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh
index baadc74e4..80edfed88 100755
--- a/Shorewall6-lite/install.sh
+++ b/Shorewall6-lite/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.4.11.4
+VERSION=4.4.11.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec
index 6fab6b4e3..b89fc7c29 100644
--- a/Shorewall6-lite/shorewall6-lite.spec
+++ b/Shorewall6-lite/shorewall6-lite.spec
@@ -1,6 +1,6 @@
 %define name shorewall6-lite
 %define version 4.4.11
-%define release 4
+%define release 5
 
 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems.
 Name: %{name}
@@ -93,6 +93,8 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Sun Sep 12 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.11-5
 * Sat Aug 28 2010 Tom Eastep tom@shorewall.net
 - Updated to 4.4.11-4
 * Thu Aug 12 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh
index 5ce32daee..c054b17f9 100755
--- a/Shorewall6-lite/uninstall.sh
+++ b/Shorewall6-lite/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=4.4.11.4
+VERSION=4.4.11.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh
index 9527e697d..0a02c3e64 100755
--- a/Shorewall6/install.sh
+++ b/Shorewall6/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.4.11.4
+VERSION=4.4.11.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec
index b8c8c72d2..55262c005 100644
--- a/Shorewall6/shorewall6.spec
+++ b/Shorewall6/shorewall6.spec
@@ -1,6 +1,6 @@
 %define name shorewall6
 %define version 4.4.11
-%define release 4
+%define release 5
 
 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems.
 Name: %{name}
@@ -98,6 +98,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6
 
 %changelog
+* Sun Sep 12 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.11-5
 * Sat Aug 28 2010 Tom Eastep tom@shorewall.net
 - Updated to 4.4.11-4
 * Thu Aug 12 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh
index ef23138f5..84fbd147e 100755
--- a/Shorewall6/uninstall.sh
+++ b/Shorewall6/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=4.4.11.4
+VERSION=4.4.11.5
 
 usage() # $1 = exit status
 {