diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index 6485cdf77..3af09b5fd 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -273,7 +273,7 @@ createchain2() # $1 = chain name, $2 = If "yes", create default rules
 #
 # Determine if a chain exists
 #
-# When we create a chain "chain", we create a variable named exists_chain and
+# When we create a chain "x", we create a variable named exists_x and
 # set its value to Yes. This function tests for the "exists_" variable
 # corresponding to the passed chain having the value of "Yes".
 #
diff --git a/Shorewall2/modules b/Shorewall2/modules
index 1d29dabe2..6846bc688 100644
--- a/Shorewall2/modules
+++ b/Shorewall2/modules
@@ -19,4 +19,9 @@
     loadmodule ip_nat_ftp
     loadmodule ip_nat_tftp
     loadmodule ip_nat_irc
+    loadmodule ip_set
+    loadmodule ip_set_iphash
+    loadmodule ip_set_ipmap
+    loadmodule ip_set_macipmap
+    loadmodule ip_set_portmap
 
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index cbfd8f277..236a000cf 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -3,7 +3,12 @@ Shorewall 2.3.0
 -----------------------------------------------------------------------
 Problems corrected in version 2.3.0
 
-None.
+1) A typo in the 'tunnel' script has been corrected (thanks to Patrik
+   Varmecký).
+
+2) Previously, if "shorewall save" was done with SAVE_IPSETS=Yes then
+   Shorewall would fail to start on reboot because the ipset modules
+   were not loaded.
 
 -----------------------------------------------------------------------
 New Features in version 2.3.0
diff --git a/Shorewall2/tunnel b/Shorewall2/tunnel
index ffbe8f6b4..1f5527b5d 100755
--- a/Shorewall2/tunnel
+++ b/Shorewall2/tunnel
@@ -108,7 +108,7 @@ do_start() {
 
       case $tunnel_type in
       gre)
-          ip tunnel add $tunnel mode gre remote $gateway local $myrealip ttl 255 ${key:+key $key)
+          ip tunnel add $tunnel mode gre remote $gateway local $myrealip ttl 255 ${key:+key $key}
 	  ;;
       *)
           ip tunnel add $tunnel mode ipip remote $gateway