diff --git a/Shorewall2/fallback.sh b/Shorewall2/fallback.sh
index 4014d9804..70867ceb0 100755
--- a/Shorewall2/fallback.sh
+++ b/Shorewall2/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=2.1.5
+VERSION=2.1.6
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index c10db462a..ba630b7ff 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -1646,27 +1646,13 @@ setup_ipsec() {
 
 	for option in $opts; do
 	    case $option in
-		reqid=*)
-		    newoptions="$newoptions --reqid ${option#*=}"
-		    ;;
-		spi=*)
-		    newoptions="$newoptions --spi ${option#*=}"
-		    ;;
-		proto=*)
-		    newoptions="$newoptions --proto ${option#*=}"
-		    ;;
-		mode=*)
-		    newoptions="$newoptions --mode ${option#*=}"
-		    ;;
-		tunnel-src=*)
-		    newoptions="$newoptions --tunnel-src ${option#*=}"
-		    ;;
-		tunnel-dst=*)
-		    newoptions="$newoptions --tunnel-dst ${option#*=}"
-		    ;;
-		*)
-		    fatal_error "Invalid option \"$option\" for zone $zone"
-		    ;;
+		reqid=*)      newoptions="$newoptions --reqid ${option#*=}" ;;
+		spi=*)        newoptions="$newoptions --spi ${option#*=}" ;;
+		proto=*)      newoptions="$newoptions --proto ${option#*=}" ;;
+		mode=*)       newoptions="$newoptions --mode ${option#*=}" ;;
+		tunnel-src=*) newoptions="$newoptions --tunnel-src ${option#*=}" ;;
+		tunnel-dst=*) newoptions="$newoptions --tunnel-dst ${option#*=}" ;;
+		*)            fatal_error "Invalid option \"$option\" for zone $zone" ;;
 	    esac
 	done
 
@@ -1697,8 +1683,8 @@ setup_ipsec() {
 		;;
 	esac
 
-	do_options "" $options
-	do_options "_in" $in_options
+	do_options ""     $options
+	do_options "_in"  $in_options
 	do_options "_out" $out_options
 
     done < $TMP_DIR/ipsec
diff --git a/Shorewall2/install.sh b/Shorewall2/install.sh
index eaf2ce4f4..3eda85388 100755
--- a/Shorewall2/install.sh
+++ b/Shorewall2/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=2.1.5
+VERSION=2.1.6
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index da8f8cc3e..38c7fefba 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -1,4 +1,4 @@
-Shorewall 2.1.5
+Shorewall 2.1.6
 
 ----------------------------------------------------------------------
 Problems Corrected since 2.0.3
diff --git a/Shorewall2/shorewall.spec b/Shorewall2/shorewall.spec
index 05064b6ce..9db37b28a 100644
--- a/Shorewall2/shorewall.spec
+++ b/Shorewall2/shorewall.spec
@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 2.1.5
+%define version 2.1.6
 %define release 1
 %define prefix /usr
 
@@ -128,6 +128,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
 
 %changelog
+* Fri Aug 20 2004 Tom Eastep tom@shorewall.net
+- Updated to 2.1.6-1
 * Wed Aug 18 2004 Tom Eastep tom@shorewall.net
 - Updated to 2.1.5-1
 - Add /etc/shorewall/ipsec
diff --git a/Shorewall2/uninstall.sh b/Shorewall2/uninstall.sh
index c997f1506..8dd64a877 100755
--- a/Shorewall2/uninstall.sh
+++ b/Shorewall2/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Seattle Firewall
 
-VERSION=2.1.5
+VERSION=2.1.6
 
 usage() # $1 = exit status
 {