diff --git a/Shorewall/Macros/macro.NFS b/Shorewall/Macros/macro.NFS
new file mode 100644
index 000000000..4501e4d09
--- /dev/null
+++ b/Shorewall/Macros/macro.NFS
@@ -0,0 +1,12 @@
+#
+# Shorewall -- /usr/share/shorewall/macro.NFS
+#
+# This macro handles NFS v4.1+ traffic with default ports.
+# You should only allow NFS traffic between hosts you fully trust.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DPORT	SPORT	ORIGDEST	RATE	USER
+
+PARAM	-	-	tcp	111		# portmapper, rpcbind
+PARAM	-	-	tcp	2049		# nfs
+PARAM	-	-	tcp	20048		# mountd
diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm
index 73f541107..2d7516589 100644
--- a/Shorewall/Perl/Shorewall/Compiler.pm
+++ b/Shorewall/Perl/Shorewall/Compiler.pm
@@ -279,7 +279,7 @@ sub generate_script_2() {
     #
     # Conditionally emit the 'generate_all_acasts() function
     #
-    my $call_generate_all_acasts = $family == F_IPV6 && ! have_capability( 'ADDRTYPE' ) && generate_all_acasts;
+    my $call_generate_all_acasts = $family == F_IPV6 && ! have_capability( 'ADDRTYPE' ) ? generate_all_acasts : '';
 
     emit( '' ,
 	  '#' ,
diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm
index cfe8598df..3be33ecf7 100644
--- a/Shorewall/Perl/Shorewall/Zones.pm
+++ b/Shorewall/Perl/Shorewall/Zones.pm
@@ -75,7 +75,6 @@ our @EXPORT = ( qw( NOTHING
 		    all_interfaces
 		    all_real_interfaces
 		    all_plain_interfaces
-		    interface_is_plain
 		    all_bridges
 		    managed_interfaces
 		    unmanaged_interfaces
diff --git a/Shorewall/Shorewall-targetname b/Shorewall/Shorewall-targetname
index e45247509..c57ae7cac 100644
--- a/Shorewall/Shorewall-targetname
+++ b/Shorewall/Shorewall-targetname
@@ -1 +1 @@
-5.2.8-RC1
+5.2.8-base