diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 25a5663d2..1f461a765 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.3
+VERSION=4.4.11.4
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec
index b81f4270d..955a8a493 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 3
+%define release 4
 
 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall).
 Name: %{name}
@@ -99,6 +99,8 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Sat Aug 28 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.11-4
 * Thu Aug 12 2010 Tom Eastep tom@shorewall.net
 - Updated to 4.4.11-3
 * Sat Jul 31 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh
index 79946e2eb..509a4d318 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.3
+VERSION=4.4.11.4
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 1e024b402..533ac7cf9 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.3
+VERSION=4.4.11.4
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index 4a3ceddd7..a375ba291 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 3
+%define release 4
 
 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
+* Sat Aug 28 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.11-4
 * Thu Aug 12 2010 Tom Eastep tom@shorewall.net
 - Updated to 4.4.11-3
 * Sat Jul 31 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index 1b26c5aa6..155a27634 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.3
+VERSION=4.4.11.4
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index 72854dab9..664ba35fe 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.3",
+		    VERSION => "4.4.11.4",
 		    CAPVERSION => 40411 ,
 		  );
 
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 24e8075c1..525dcd9b3 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.3
+VERSION=4.4.11.4
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/known_problems.txt b/Shorewall/known_problems.txt
index 42ab190f8..d9716302d 100644
--- a/Shorewall/known_problems.txt
+++ b/Shorewall/known_problems.txt
@@ -90,30 +90,30 @@
     to rules, OPTIMIZE 8 through 15 can result in invalid
     iptables-restore (ip6tables-restore) input.
 
-    Workaround: Don't use optimizaiton levels greater than 7.
+    Corrected in Shorewall 4.4.11.4.
 
 13) Under rare circumstances involving exclusion, OPTIMIZE 8 through 15
     can result in invalid iptables-restore (ip6tables-restore) input.
 
-    Workaround: Don't use optimizaiton levels greater than 7.
+    Corrected in Shorewall 4.4.11.4.
 
 14) When REQUIRE_INTERFACE=Yes, start/restart will fail unless the last
     optional interface defined in the interfaces file is available.
 
-    Workaround: None available.
+    Corrected in Shorewall 4.4.11.4.
 
 15) The compiler erroneously allows exclusion in CONTINUE rules
     (tcrules and rules files). The generated iptables (ip6tables) rules
     do not work as expected.
 
-    Workaround: Do not use exclusion with CONTINUE.
+    Corrected in Shorewall 4.4.11.4.
 
 16) Exclusion in blacklist file entries is correctly validated but is
     then ignored when generating iptables (ip6tables) input.
 
-    Workaround: Do not use exclusion in the blacklist file.
+    Corrected in Shorewall 4.4.11.4.
 
 17) The interface options combination of 'optional' and 'upnpclient'
     does not work correctly.
 
-    Workaround: Do not use these two options on the same interface.
+    Corrected in Shorewall 4.4.11.4.
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 8f85dee09..b0daf92e4 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -230,6 +230,9 @@ 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
 3)  When REQUIRE_INTERFACE=Yes, start/restart would fail unless the
     last optional interface was available.
 
+4)  Previously, the interface option combination of 'optional' and
+    'upnpclient' did not work correctly.
+
 4.4.11.3
 
 1)  When 'any' was used in the rules SOURCE column, a duplicate rule
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 6900006f0..9c2e43f24 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -1,6 +1,6 @@
 %define name shorewall
 %define version 4.4.11
-%define release 3
+%define release 4
 
 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
+* Sat Aug 28 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.11-4
 * Thu Aug 12 2010 Tom Eastep tom@shorewall.net
 - Updated to 4.4.11-3
 * Sat Jul 31 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index 0269176da..f4e2d5c5b 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.3
+VERSION=4.4.11.4
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh
index 6de995345..baadc74e4 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.3
+VERSION=4.4.11.4
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec
index 717cfd310..6fab6b4e3 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 3
+%define release 4
 
 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
+* Sat Aug 28 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.11-4
 * Thu Aug 12 2010 Tom Eastep tom@shorewall.net
 - Updated to 4.4.11-3
 * Sat Jul 31 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh
index bd510c993..5ce32daee 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.3
+VERSION=4.4.11.4
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh
index 726e41c16..9527e697d 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.3
+VERSION=4.4.11.4
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec
index 4e51b6d84..b8c8c72d2 100644
--- a/Shorewall6/shorewall6.spec
+++ b/Shorewall6/shorewall6.spec
@@ -1,6 +1,6 @@
 %define name shorewall6
 %define version 4.4.11
-%define release 3
+%define release 4
 
 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
+* Sat Aug 28 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.11-4
 * Thu Aug 12 2010 Tom Eastep tom@shorewall.net
 - Updated to 4.4.11-3
 * Sat Jul 31 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh
index 976e9e832..ef23138f5 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.3
+VERSION=4.4.11.4
 
 usage() # $1 = exit status
 {