diff --git a/Shorewall/Samples/Universal/shorewall.conf b/Shorewall/Samples/Universal/shorewall.conf
index c001c8473..015d9b23d 100644
--- a/Shorewall/Samples/Universal/shorewall.conf
+++ b/Shorewall/Samples/Universal/shorewall.conf
@@ -2,7 +2,7 @@
 #
 #  Shorewall Version 5 -- /etc/shorewall/shorewall.conf
 #
-#  For information about the settings in this file, type "man shorewall.conf"
+#  For $LOGrmation about the settings in this file, type "man shorewall.conf"
 #
 #  Manpage also online at http://www.shorewall.net/manpages/shorewall.conf.html
 ###############################################################################
@@ -53,19 +53,19 @@ LOGTAGONLY=No
 
 LOGLIMIT="s:1/sec:10"
 
-MACLIST_LOG_LEVEL=info
+MACLIST_LOG_LEVEL=$LOG
 
 RELATED_LOG_LEVEL=
 
-RPFILTER_LOG_LEVEL=info
+RPFILTER_LOG_LEVEL=$LOG
 
-SFILTER_LOG_LEVEL=info
+SFILTER_LOG_LEVEL=$LOG
 
-SMURF_LOG_LEVEL=info
+SMURF_LOG_LEVEL=$LOG
 
 STARTUP_LOG=/var/log/shorewall-init.log
 
-TCP_FLAGS_LOG_LEVEL=info
+TCP_FLAGS_LOG_LEVEL=$LOG
 
 UNTRACKED_LOG_LEVEL=
 
diff --git a/Shorewall/Samples/one-interface/shorewall.conf b/Shorewall/Samples/one-interface/shorewall.conf
index f6a37d81c..e5723282e 100644
--- a/Shorewall/Samples/one-interface/shorewall.conf
+++ b/Shorewall/Samples/one-interface/shorewall.conf
@@ -100,6 +100,7 @@ LOCKFILE=
 
 MODULESDIR=
 
+NFACCT=
 
 PERL=/usr/bin/perl
 
diff --git a/Shorewall/Samples/three-interfaces/shorewall.conf b/Shorewall/Samples/three-interfaces/shorewall.conf
index 1a594ade1..c5f507c59 100644
--- a/Shorewall/Samples/three-interfaces/shorewall.conf
+++ b/Shorewall/Samples/three-interfaces/shorewall.conf
@@ -11,7 +11,7 @@
 #
 # See the file README.txt for further details.
 #
-# For information about the settings in this file, type "man shorewall.conf"
+# For $LOGrmation about the settings in this file, type "man shorewall.conf"
 #
 # The manpage is also online at
 # http://shorewall.net/manpages/shorewall.conf.html
@@ -61,19 +61,19 @@ LOGTAGONLY=No
 
 LOGLIMIT="s:1/sec:10"
 
-MACLIST_LOG_LEVEL=info
+MACLIST_LOG_LEVEL=$LOG
 
 RELATED_LOG_LEVEL=
 
-RPFILTER_LOG_LEVEL=info
+RPFILTER_LOG_LEVEL=$LOG
 
-SFILTER_LOG_LEVEL=info
+SFILTER_LOG_LEVEL=$LOG
 
-SMURF_LOG_LEVEL=info
+SMURF_LOG_LEVEL=$LOG
 
 STARTUP_LOG=/var/log/shorewall-init.log
 
-TCP_FLAGS_LOG_LEVEL=info
+TCP_FLAGS_LOG_LEVEL=$LOG
 
 UNTRACKED_LOG_LEVEL=
 
diff --git a/Shorewall/Samples/two-interfaces/shorewall.conf b/Shorewall/Samples/two-interfaces/shorewall.conf
index e1a9ee408..60de35479 100644
--- a/Shorewall/Samples/two-interfaces/shorewall.conf
+++ b/Shorewall/Samples/two-interfaces/shorewall.conf
@@ -11,7 +11,7 @@
 #
 # See the file README.txt for further details.
 #
-# For information about the settings in this file, type "man shorewall.conf"
+# For $LOGrmation about the settings in this file, type "man shorewall.conf"
 #
 # The manpage is also online at
 # http://shorewall.net/manpages/shorewall.conf.html
@@ -64,19 +64,19 @@ LOGTAGONLY=No
 
 LOGLIMIT="s:1/sec:10"
 
-MACLIST_LOG_LEVEL=info
+MACLIST_LOG_LEVEL=$LOG
 
 RELATED_LOG_LEVEL=
 
-RPFILTER_LOG_LEVEL=info
+RPFILTER_LOG_LEVEL=$LOG
 
-SFILTER_LOG_LEVEL=info
+SFILTER_LOG_LEVEL=$LOG
 
-SMURF_LOG_LEVEL=info
+SMURF_LOG_LEVEL=$LOG
 
 STARTUP_LOG=/var/log/shorewall-init.log
 
-TCP_FLAGS_LOG_LEVEL=info
+TCP_FLAGS_LOG_LEVEL=$LOG
 
 UNTRACKED_LOG_LEVEL=