diff --git a/Shorewall/Samples/Universal/interfaces b/Shorewall/Samples/Universal/interfaces
index 03e8d8257..bccdb1b29 100644
--- a/Shorewall/Samples/Universal/interfaces
+++ b/Shorewall/Samples/Universal/interfaces
@@ -6,7 +6,8 @@
 # The manpage is also online at
 # http://www.shorewall.net/manpages/shorewall-interfaces.html
 #
+FORMAT 2
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS
--	lo		-		ignore
-net	all		-		dhcp,physical=+,routeback,optional
+#ZONE	INTERFACE	OPTIONS
+-	lo		ignore
+net	all		dhcp,physical=+,routeback,optional
diff --git a/Shorewall/Samples/one-interface/interfaces b/Shorewall/Samples/one-interface/interfaces
index ebdc53382..7cc93575a 100644
--- a/Shorewall/Samples/one-interface/interfaces
+++ b/Shorewall/Samples/one-interface/interfaces
@@ -10,6 +10,7 @@
 # See the file README.txt for further details.
 #------------------------------------------------------------------------------
 # For information about entries in this file, type "man shorewall-interfaces"
+FORMAT 2
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS
-net     eth0            detect          dhcp,tcpflags,logmartians,nosmurfs
+#ZONE	INTERFACE	OPTIONS
+net     eth0            dhcp,tcpflags,logmartians,nosmurfs
diff --git a/Shorewall/Samples/three-interfaces/interfaces b/Shorewall/Samples/three-interfaces/interfaces
index a4b7b5033..c670e76ac 100644
--- a/Shorewall/Samples/three-interfaces/interfaces
+++ b/Shorewall/Samples/three-interfaces/interfaces
@@ -10,8 +10,9 @@
 # See the file README.txt for further details.
 #------------------------------------------------------------------------------
 # For information about entries in this file, type "man shorewall-interfaces"
+FORMAT 2
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS
-net     eth0            detect          tcpflags,dhcp,nosmurfs,routefilter,logmartians
-loc     eth1            detect          tcpflags,nosmurfs,routefilter,logmartians
-dmz     eth2            detect		tcpflags,nosmurfs,routefilter,logmartians
+#ZONE	INTERFACE	OPTIONS
+net     eth0            tcpflags,dhcp,nosmurfs,routefilter,logmartians
+loc     eth1            tcpflags,nosmurfs,routefilter,logmartians
+dmz     eth2            tcpflags,nosmurfs,routefilter,logmartians
diff --git a/Shorewall/Samples/two-interfaces/interfaces b/Shorewall/Samples/two-interfaces/interfaces
index 81bb60890..1cd601449 100644
--- a/Shorewall/Samples/two-interfaces/interfaces
+++ b/Shorewall/Samples/two-interfaces/interfaces
@@ -10,7 +10,8 @@
 # See the file README.txt for further details.
 #------------------------------------------------------------------------------
 # For information about entries in this file, type "man shorewall-interfaces"
+FORMAT 2
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS
-net     eth0            detect          dhcp,tcpflags,nosmurfs,routefilter,logmartians
-loc     eth1            detect          tcpflags,nosmurfs,routefilter,logmartians
+#ZONE	INTERFACE	OPTIONS
+net     eth0            dhcp,tcpflags,nosmurfs,routefilter,logmartians
+loc     eth1            tcpflags,nosmurfs,routefilter,logmartians
diff --git a/Shorewall/configfiles/interfaces b/Shorewall/configfiles/interfaces
index 935f9a5ef..803efec99 100644
--- a/Shorewall/configfiles/interfaces
+++ b/Shorewall/configfiles/interfaces
@@ -6,9 +6,6 @@
 # The manpage is also online at
 # http://www.shorewall.net/manpages/shorewall-interfaces.html
 #
-###############################################################################
-FORMAT 1
-#ZONE	INTERFACE	BROADCAST	OPTIONS
-
 FORMAT 2
+###############################################################################
 #ZONE		INTERFACE		OPTIONS
diff --git a/Shorewall6/Samples6/Universal/interfaces b/Shorewall6/Samples6/Universal/interfaces
index b9d6b3b3e..61021f9a7 100644
--- a/Shorewall6/Samples6/Universal/interfaces
+++ b/Shorewall6/Samples6/Universal/interfaces
@@ -6,8 +6,9 @@
 # The manpage is also online at
 # http://www.shorewall.net/manpages/shorewall-interfaces.html
 #
+FORMAT 2
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS
--	lo		-		ignore
-net	all		-		dhcp,physical=+,routeback
+#ZONE	INTERFACE	OPTIONS
+-	lo		ignore
+net	all		dhcp,physical=+,routeback
 
diff --git a/Shorewall6/Samples6/one-interface/interfaces b/Shorewall6/Samples6/one-interface/interfaces
index e86c27538..ed2131f9d 100644
--- a/Shorewall6/Samples6/one-interface/interfaces
+++ b/Shorewall6/Samples6/one-interface/interfaces
@@ -10,6 +10,7 @@
 # See the file README.txt for further details.
 #------------------------------------------------------------------------------
 # For information about entries in this file, type "man shorewall6-interfaces"
+FORMAT 2
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS
-net     eth0            detect          tcpflags
+#ZONE	INTERFACE	OPTIONS
+net     eth0            tcpflags
diff --git a/Shorewall6/Samples6/three-interfaces/interfaces b/Shorewall6/Samples6/three-interfaces/interfaces
index 7bf0d2855..db8091db1 100644
--- a/Shorewall6/Samples6/three-interfaces/interfaces
+++ b/Shorewall6/Samples6/three-interfaces/interfaces
@@ -10,8 +10,9 @@
 # See the file README.txt for further details.
 #------------------------------------------------------------------------------
 # For information about entries in this file, type "man shorewall6-interfaces"
+FORMAT 2
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS
-net     eth0            detect          tcpflags,forward=1
-loc     eth1            detect          tcpflags,forward=1
-dmz     eth2            detect		tcpflags,forward=1
+#ZONE	INTERFACE	OPTIONS
+net     eth0            tcpflags,forward=1
+loc     eth1            tcpflags,forward=1
+dmz     eth2            tcpflags,forward=1
diff --git a/Shorewall6/Samples6/two-interfaces/interfaces b/Shorewall6/Samples6/two-interfaces/interfaces
index 6641eb4b6..18a661744 100644
--- a/Shorewall6/Samples6/two-interfaces/interfaces
+++ b/Shorewall6/Samples6/two-interfaces/interfaces
@@ -10,7 +10,8 @@
 # See the file README.txt for further details.
 #------------------------------------------------------------------------------
 # For information about entries in this file, type "man shorewall6-interfaces"
+FORMAT 2
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS
-net     eth0            detect          tcpflags,forward=1
-loc     eth1            detect          tcpflags,forward=1
+#ZONE	INTERFACE	OPTIONS
+net     eth0            tcpflags,forward=1
+loc     eth1            tcpflags,forward=1