diff --git a/Shorewall-core/configure b/Shorewall-core/configure
index e5d9b9a0e..2890b27b9 100755
--- a/Shorewall-core/configure
+++ b/Shorewall-core/configure
@@ -236,7 +236,8 @@ for on in \
     ANNOTATED \
     VARLIB \
     VARDIR \
-    DEFAULT_PAGER
+    DEFAULT_PAGER \
+    SHARED_CONFIG
 do
     echo "$on=${options[${on}]}"
     echo "$on=${options[${on}]}" >> shorewallrc
diff --git a/Shorewall-core/configure.pl b/Shorewall-core/configure.pl
index 7b4b62057..1a60712e2 100755
--- a/Shorewall-core/configure.pl
+++ b/Shorewall-core/configure.pl
@@ -210,7 +210,8 @@ for ( qw/ HOST
 	  ANNOTATED
 	  VARLIB
 	  VARDIR
-          DEFAULT_PAGER / ) {
+          DEFAULT_PAGER
+          SHARED_CONFIG / ) {
 
     my $val = $options{$_} || '';
 
diff --git a/Shorewall-core/shorewallrc.apple b/Shorewall-core/shorewallrc.apple
index fc20486f0..ac31f8919 100644
--- a/Shorewall-core/shorewallrc.apple
+++ b/Shorewall-core/shorewallrc.apple
@@ -3,20 +3,21 @@
 #
 BUILD=apple
 HOST=apple
-PREFIX=/usr                            #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share               #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share             #Directory for executable scripts.
+PREFIX=/usr			       #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share	       #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share	       #Directory for executable scripts.
 PERLLIBDIR=${PREFIX}/share/shorewall   #Directory to install Shorewall Perl module directory
-CONFDIR=/etc                           #Directory where subsystem configurations are installed
-SBINDIR=/sbin                          #Directory where system administration programs are installed
-MANDIR=${SHAREDIR}/man                 #Directory where manpages are installed.
-INITDIR=                               #Unused on OS X
-INITFILE=                              #Unused on OS X
-INITSOURCE=                            #Unused on OS X
-ANNOTATED=                             #Unused on OS X
-SERVICEDIR=                            #Unused on OS X
-SERVICEFILE=                           #Unused on OS X
-SYSCONFDIR=                            #Unused on OS X
-SPARSE=Yes                             #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR.
-VARLIB=/var/lib                        #Unused on OS X
+CONFDIR=/etc			       #Directory where subsystem configurations are installed
+SBINDIR=/sbin			       #Directory where system administration programs are installed
+MANDIR=${SHAREDIR}/man		       #Directory where manpages are installed.
+INITDIR=			       #Unused on OS X
+INITFILE=			       #Unused on OS X
+INITSOURCE=			       #Unused on OS X
+ANNOTATED=			       #Unused on OS X
+SERVICEDIR=			       #Unused on OS X
+SERVICEFILE=			       #Unused on OS X
+SYSCONFDIR=			       #Unused on OS X
+SPARSE=Yes			       #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR.
+VARLIB=/var/lib			       #Unused on OS X
 DEFAULT_PAGER=			       #Pager to use if none specified in shorewall[6].conf
+SHARED_CONFIG=			       #Configuration serves both Shorewall and Shorewall6
diff --git a/Shorewall-core/shorewallrc.archlinux b/Shorewall-core/shorewallrc.archlinux
index 68a694410..fbb23e5cb 100644
--- a/Shorewall-core/shorewallrc.archlinux
+++ b/Shorewall-core/shorewallrc.archlinux
@@ -1,23 +1,24 @@
 #
 # Arch Linux Shorewall 5.0 rc file
 #
-BUILD=                                 #Default is to detect the build system
+BUILD=				       #Default is to detect the build system
 HOST=archlinux
-PREFIX=/usr                            #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share               #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share             #Directory for executable scripts.
+PREFIX=/usr			       #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share	       #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share	       #Directory for executable scripts.
 PERLLIBDIR=${PREFIX}/share/shorewall   #Directory to install Shorewall Perl module directory
-CONFDIR=/etc                           #Directory where subsystem configurations are installed
-SBINDIR=/usr/bin                       #Directory where system administration programs are installed
-MANDIR=${SHAREDIR}/man                 #Directory where manpages are installed.
-INITDIR=                               #Directory where SysV init scripts are installed.
-INITFILE=                              #Name of the product's installed SysV init script
-INITSOURCE=                            #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                             #If non-zero, annotated configuration files are installed
-SYSCONFDIR=                            #Directory where SysV init parameter files are installed
+CONFDIR=/etc			       #Directory where subsystem configurations are installed
+SBINDIR=/usr/bin		       #Directory where system administration programs are installed
+MANDIR=${SHAREDIR}/man		       #Directory where manpages are installed.
+INITDIR=			       #Directory where SysV init scripts are installed.
+INITFILE=			       #Name of the product's installed SysV init script
+INITSOURCE=			       #Name of the distributed file to be installed as the SysV init script
+ANNOTATED=			       #If non-zero, annotated configuration files are installed
+SYSCONFDIR=			       #Directory where SysV init parameter files are installed
 SERVICEDIR=/usr/lib/systemd/system     #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=                           #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
-SPARSE=                                #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/var/lib                        #Directory where product variable data is stored.
-VARDIR=${VARLIB}/$PRODUCT              #Directory where product variable data is stored.
+SERVICEFILE=			       #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
+SPARSE=				       #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=/var/lib			       #Directory where product variable data is stored.
+VARDIR=${VARLIB}/$PRODUCT	       #Directory where product variable data is stored.
 DEFAULT_PAGER=			       #Pager to use if none specified in shorewall[6].conf
+SHARED_CONFIG=			       #Configuration serves both Shorewall and Shorewall6
diff --git a/Shorewall-core/shorewallrc.cygwin b/Shorewall-core/shorewallrc.cygwin
index 371c135ea..94cf59ef9 100644
--- a/Shorewall-core/shorewallrc.cygwin
+++ b/Shorewall-core/shorewallrc.cygwin
@@ -3,20 +3,21 @@
 #
 BUILD=cygwin
 HOST=cygwin
-PREFIX=/usr                           #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share              #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share            #Directory for executable scripts.
+PREFIX=/usr			      #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share	      #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share	      #Directory for executable scripts.
 PERLLIBDIR=${PREFIX}/share/shorewall  #Directory to install Shorewall Perl module directory
-CONFDIR=/etc                          #Directory where subsystem configurations are installed
-SBINDIR=/bin                          #Directory where system administration programs are installed
-MANDIR=${SHAREDIR}/man                #Directory where manpages are installed.
-INITDIR=/etc/init.d                   #Unused on Cygwin
-INITFILE=                             #Unused on Cygwin
-INITSOURCE=                           #Unused on Cygwin
-ANNOTATED=                            #Unused on Cygwin
-SERVICEDIR=                           #Unused on Cygwin
-SERVICEFILE=                          #Unused on Cygwin
-SYSCONFDIR=                           #Unused on Cygwin
-SPARSE=Yes                            #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR.
-VARLIB=/var/lib                       #Unused on Cygwin
+CONFDIR=/etc			      #Directory where subsystem configurations are installed
+SBINDIR=/bin			      #Directory where system administration programs are installed
+MANDIR=${SHAREDIR}/man		      #Directory where manpages are installed.
+INITDIR=/etc/init.d		      #Unused on Cygwin
+INITFILE=			      #Unused on Cygwin
+INITSOURCE=			      #Unused on Cygwin
+ANNOTATED=			      #Unused on Cygwin
+SERVICEDIR=			      #Unused on Cygwin
+SERVICEFILE=			      #Unused on Cygwin
+SYSCONFDIR=			      #Unused on Cygwin
+SPARSE=Yes			      #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR.
+VARLIB=/var/lib			      #Unused on Cygwin
 DEFAULT_PAGER=			      #Pager to use if none specified in shorewall[6].conf
+SHARED_CONFIG=			      #Configuration serves both Shorewall and Shorewall6
diff --git a/Shorewall-core/shorewallrc.debian.systemd b/Shorewall-core/shorewallrc.debian.systemd
index 788a24008..95ffb76fa 100644
--- a/Shorewall-core/shorewallrc.debian.systemd
+++ b/Shorewall-core/shorewallrc.debian.systemd
@@ -15,10 +15,11 @@ INITFILE=				#Name of the product's installed SysV init script
 INITSOURCE=init.debian.sh		#Name of the distributed file to be installed as the SysV init script
 ANNOTATED=				#If non-zero, annotated configuration files are installed
 SYSCONFFILE=default.debian.systemd		#Name of the distributed file to be installed in $SYSCONFDIR
-SERVICEFILE=$PRODUCT.service.debian     #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
+SERVICEFILE=$PRODUCT.service.debian	#Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
 SYSCONFDIR=/etc/default			#Directory where SysV init parameter files are installed
 SERVICEDIR=/lib/systemd/system		#Directory where .service files are installed (systems running systemd only)
 SPARSE=Yes				#If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
 VARLIB=/var/lib				#Directory where product variable data is stored.
 VARDIR=${VARLIB}/$PRODUCT		#Directory where product variable data is stored.
 DEFAULT_PAGER=/usr/bin/less		#Pager to use if none specified in shorewall[6].conf
+SHARED_CONFIG=				#Configuration serves both Shorewall and Shorewall6
diff --git a/Shorewall-core/shorewallrc.debian.sysvinit b/Shorewall-core/shorewallrc.debian.sysvinit
index 3c4de80b5..de60133ac 100644
--- a/Shorewall-core/shorewallrc.debian.sysvinit
+++ b/Shorewall-core/shorewallrc.debian.sysvinit
@@ -1,24 +1,25 @@
 #
 # Debian Shorewall 5.0 rc file
 #
-BUILD=                                  #Default is to detect the build system
+BUILD=					#Default is to detect the build system
 HOST=debian
-PREFIX=/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=/etc/init.d                     #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.debian.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSCONFFILE=default.debian.sysvinit              #Name of the distributed file to be installed in $SYSCONFDIR
+PREFIX=/usr				#Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share		#Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share		#Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall	#Directory to install Shorewall Perl module directory
+CONFDIR=/etc				#Directory where subsystem configurations are installed
+SBINDIR=/sbin				#Directory where system administration programs are installed
+MANDIR=${PREFIX}/share/man		#Directory where manpages are installed.
+INITDIR=/etc/init.d			#Directory where SysV init scripts are installed.
+INITFILE=$PRODUCT			#Name of the product's installed SysV init script
+INITSOURCE=init.debian.sh		#Name of the distributed file to be installed as the SysV init script
+ANNOTATED=				#If non-zero, annotated configuration files are installed
+SYSCONFFILE=default.debian.sysvinit		 #Name of the distributed file to be installed in $SYSCONFDIR
 SERVICEFILE=				#Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
-SYSCONFDIR=/etc/default                 #Directory where SysV init parameter files are installed
+SYSCONFDIR=/etc/default			#Directory where SysV init parameter files are installed
 SERVICEDIR=				#Directory where .service files are installed (systems running systemd only)
-SPARSE=Yes                              #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/$PRODUCT               #Directory where product variable data is stored.
+SPARSE=Yes				#If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=/var/lib				#Directory where product variable data is stored.
+VARDIR=${VARLIB}/$PRODUCT		#Directory where product variable data is stored.
 DEFAULT_PAGER=/usr/bin/less		#Pager to use if none specified in shorewall[6].conf
+SHARED_CONFIG=				#Configuration serves both Shorewall and Shorewall6
diff --git a/Shorewall-core/shorewallrc.default b/Shorewall-core/shorewallrc.default
index 8a1f1cc74..d84d905bf 100644
--- a/Shorewall-core/shorewallrc.default
+++ b/Shorewall-core/shorewallrc.default
@@ -1,24 +1,25 @@
 #
 # Default Shorewall 5.0 rc file
 #
-BUILD=                                  #Default is to detect the build system
-HOST=linux                              #Generic Linux
-PREFIX=/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/man                    #Directory where manpages are installed.
-INITDIR=/etc/init.d                     #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.sh                      #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SERVICEDIR=                             #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=                            #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
-SYSCONFFILE=                            #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=                             #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/$PRODUCT               #Directory where product variable data is stored.
+BUILD=					#Default is to detect the build system
+HOST=linux				#Generic Linux
+PREFIX=/usr				#Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share		#Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share		#Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall	#Directory to install Shorewall Perl module directory
+CONFDIR=/etc				#Directory where subsystem configurations are installed
+SBINDIR=/sbin				#Directory where system administration programs are installed
+MANDIR=${PREFIX}/man			#Directory where manpages are installed.
+INITDIR=/etc/init.d			#Directory where SysV init scripts are installed.
+INITFILE=$PRODUCT			#Name of the product's installed SysV init script
+INITSOURCE=init.sh			#Name of the distributed file to be installed as the SysV init script
+ANNOTATED=				#If non-zero, annotated configuration files are installed
+SERVICEDIR=				#Directory where .service files are installed (systems running systemd only)
+SERVICEFILE=				#Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
+SYSCONFFILE=				#Name of the distributed file to be installed in $SYSCONFDIR
+SYSCONFDIR=				#Directory where SysV init parameter files are installed
+SPARSE=					#If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=/var/lib				#Directory where product variable data is stored.
+VARDIR=${VARLIB}/$PRODUCT		#Directory where product variable data is stored.
 DEFAULT_PAGER=				#Pager to use if none specified in shorewall[6].conf
+SHARED_CONFIG=				#Configuration serves both Shorewall and Shorewall6
diff --git a/Shorewall-core/shorewallrc.openwrt b/Shorewall-core/shorewallrc.openwrt
index 9f18c1741..280774793 100644
--- a/Shorewall-core/shorewallrc.openwrt
+++ b/Shorewall-core/shorewallrc.openwrt
@@ -1,24 +1,25 @@
 #
 # OpenWRT Shorewall 5.0 rc file
 #
-BUILD=                                 #Default is to detect the build system
+BUILD=				       #Default is to detect the build system
 HOST=openwrt
-PREFIX=/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=                                 #Directory where manpages are installed.
-INITDIR=/etc/init.d                     #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.openwrt.sh              #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSCONFDIR=${CONFDIR}/sysconfig         #Directory where SysV init parameter files are installed
-SYSCONFFILE=sysconfig                   #Name of the distributed file to be installed in $SYSCONFDIR
+PREFIX=/usr				#Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share		#Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share		#Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall	#Directory to install Shorewall Perl module directory
+CONFDIR=/etc				#Directory where subsystem configurations are installed
+SBINDIR=/sbin				#Directory where system administration programs are installed
+MANDIR=					#Directory where manpages are installed.
+INITDIR=/etc/init.d			#Directory where SysV init scripts are installed.
+INITFILE=$PRODUCT			#Name of the product's installed SysV init script
+INITSOURCE=init.openwrt.sh		#Name of the distributed file to be installed as the SysV init script
+ANNOTATED=				#If non-zero, annotated configuration files are installed
+SYSCONFDIR=${CONFDIR}/sysconfig		#Directory where SysV init parameter files are installed
+SYSCONFFILE=sysconfig			#Name of the distributed file to be installed in $SYSCONFDIR
 SERVICEDIR=				#Directory where .service files are installed (systems running systemd only)
 SERVICEFILE=				#Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/lib                             #Directory where product variable data is stored.
-VARDIR=${VARLIB}/$PRODUCT               #Directory where product variable data is stored.
+SPARSE=					#If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=/lib				#Directory where product variable data is stored.
+VARDIR=${VARLIB}/$PRODUCT		#Directory where product variable data is stored.
 DEFAULT_PAGER=				#Pager to use if none specified in shorewall[6].conf
+SHARED_CONFIG=				#Configuration serves both Shorewall and Shorewall6
diff --git a/Shorewall-core/shorewallrc.redhat b/Shorewall-core/shorewallrc.redhat
index 122891c21..a8a553fd8 100644
--- a/Shorewall-core/shorewallrc.redhat
+++ b/Shorewall-core/shorewallrc.redhat
@@ -1,24 +1,25 @@
 #
 # RedHat/FedoraShorewall 5.0 rc file
 #
-BUILD=                                  #Default is to detect the build system
+BUILD=					#Default is to detect the build system
 HOST=redhat
-PREFIX=/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/libexec            #Directory for executable scripts.
+PREFIX=/usr				#Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share		#Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/libexec		#Directory for executable scripts.
 PERLLIBDIR=/usr/share/perl5/vendor_perl #Directory to install Shorewall Perl module directory
-CONFDIR=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${SHAREDIR}/man                  #Directory where manpages are installed.
-INITDIR=/etc/rc.d/init.d                #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.fedora.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SERVICEDIR=/lib/systemd/system          #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE=sysconfig                   #Name of the distributed file to be installed as $SYSCONFDIR/$PRODUCT
-SERVICEFILE=                      	#Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
-SYSCONFDIR=/etc/sysconfig/              #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/$PRODUCT               #Directory where product variable data is stored.
+CONFDIR=/etc				#Directory where subsystem configurations are installed
+SBINDIR=/sbin				#Directory where system administration programs are installed
+MANDIR=${SHAREDIR}/man			#Directory where manpages are installed.
+INITDIR=/etc/rc.d/init.d		#Directory where SysV init scripts are installed.
+INITFILE=$PRODUCT			#Name of the product's installed SysV init script
+INITSOURCE=init.fedora.sh		#Name of the distributed file to be installed as the SysV init script
+ANNOTATED=				#If non-zero, annotated configuration files are installed
+SERVICEDIR=/lib/systemd/system		#Directory where .service files are installed (systems running systemd only)
+SYSCONFFILE=sysconfig			#Name of the distributed file to be installed as $SYSCONFDIR/$PRODUCT
+SERVICEFILE=				#Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
+SYSCONFDIR=/etc/sysconfig/		#Directory where SysV init parameter files are installed
+SPARSE=					#If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=/var/lib				#Directory where product variable data is stored.
+VARDIR=${VARLIB}/$PRODUCT		#Directory where product variable data is stored.
 DEFAULT_PAGER=				#Pager to use if none specified in shorewall[6].conf
+SHARED_CONFIG=				#Configuration serves both Shorewall and Shorewall6
diff --git a/Shorewall-core/shorewallrc.slackware b/Shorewall-core/shorewallrc.slackware
index a52bf8233..4a9b3cd88 100644
--- a/Shorewall-core/shorewallrc.slackware
+++ b/Shorewall-core/shorewallrc.slackware
@@ -3,23 +3,24 @@
 #
 BUILD=slackware
 HOST=slackware
-PREFIX=/usr                                #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                   #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share                 #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall       #Directory to install Shorewall Perl module directory
-CONFDIR=/etc                               #Directory where subsystem configurations are installed
-SBINDIR=/sbin                              #Directory where system administration programs are installed
-MANDIR=${PREFIX}/man                       #Directory where manpages are installed.
-INITDIR=/etc/rc.d                          #Directory where SysV init scripts are installed.
+PREFIX=/usr				   #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share		   #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share		   #Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall	   #Directory to install Shorewall Perl module directory
+CONFDIR=/etc				   #Directory where subsystem configurations are installed
+SBINDIR=/sbin				   #Directory where system administration programs are installed
+MANDIR=${PREFIX}/man			   #Directory where manpages are installed.
+INITDIR=/etc/rc.d			   #Directory where SysV init scripts are installed.
 AUXINITSOURCE=init.slackware.firewall.sh   #Name of the distributed file to be installed as the SysV init script
-AUXINITFILE=rc.firewall                    #Name of the product's installed SysV init script
-INITSOURCE=init.slackware.$PRODUCT.sh      #Name of the distributed file to be installed as a second SysV init script
-INITFILE=rc.$PRODUCT                       #Name of the product's installed second init script
-SERVICEDIR=                                #Name of the directory where .service files are installed (systems running systemd only)
-SERVICEFILE=                               #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
-SYSCONFFILE=                               #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=                                #Name of the directory where SysV init parameter files are installed.
-ANNOTATED=                                 #If non-empty, install annotated configuration files
-VARLIB=/var/lib                            #Directory where product variable data is stored.
-VARDIR=${VARLIB}/$PRODUCT                  #Directory where product variable data is stored.
+AUXINITFILE=rc.firewall			   #Name of the product's installed SysV init script
+INITSOURCE=init.slackware.$PRODUCT.sh	   #Name of the distributed file to be installed as a second SysV init script
+INITFILE=rc.$PRODUCT			   #Name of the product's installed second init script
+SERVICEDIR=				   #Name of the directory where .service files are installed (systems running systemd only)
+SERVICEFILE=				   #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
+SYSCONFFILE=				   #Name of the distributed file to be installed in $SYSCONFDIR
+SYSCONFDIR=				   #Name of the directory where SysV init parameter files are installed.
+ANNOTATED=				   #If non-empty, install annotated configuration files
+VARLIB=/var/lib				   #Directory where product variable data is stored.
+VARDIR=${VARLIB}/$PRODUCT		   #Directory where product variable data is stored.
 DEFAULT_PAGER=				   #Pager to use if none specified in shorewall[6].conf
+SHARED_CONFIG=				   #Configuration serves both Shorewall and Shorewall6
diff --git a/Shorewall-core/shorewallrc.suse b/Shorewall-core/shorewallrc.suse
index e529f3d12..d25c635ab 100644
--- a/Shorewall-core/shorewallrc.suse
+++ b/Shorewall-core/shorewallrc.suse
@@ -1,24 +1,25 @@
 #
 # SuSE Shorewall 5.0 rc file
 #
-BUILD=                                                #Default is to detect the build system
+BUILD=						      #Default is to detect the build system
 HOST=suse
-PREFIX=/usr                                           #Top-level directory for shared files, libraries, etc.
-CONFDIR=/etc                                          #Directory where subsystem configurations are installed
-SHAREDIR=${PREFIX}/share                              #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/lib                              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/lib/perl5/site-perl              #Directory to install Shorewall Perl module directory
-SBINDIR=/usr/sbin                                     #Directory where system administration programs are installed
-MANDIR=${SHAREDIR}/man/                               #Directory where manpages are installed.
-INITDIR=/etc/init.d                                   #Directory where SysV init scripts are installed.
-INITFILE=                                             #Name of the product's SysV init script
-INITSOURCE=init.suse.sh                               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                                            #If non-zero, annotated configuration files are installed
-SERVICEDIR=/usr/lib/systemd/system                    #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=$PRODUCT.service          		      #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
-SYSCONFFILE=sysconfig                                 #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=/etc/sysconfig/                            #Directory where SysV init parameter files are installed
-SPARSE=                                               #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/var/lib                                       #Directory where persistent product data is stored.
-VARDIR=${VARLIB}/$PRODUCT                             #Directory where product variable data is stored.
-DEFAULT_PAGER=				   	      #Pager to use if none specified in shorewall[6].conf
+PREFIX=/usr					      #Top-level directory for shared files, libraries, etc.
+CONFDIR=/etc					      #Directory where subsystem configurations are installed
+SHAREDIR=${PREFIX}/share			      #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/lib			      #Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/lib/perl5/site-perl	      #Directory to install Shorewall Perl module directory
+SBINDIR=/usr/sbin				      #Directory where system administration programs are installed
+MANDIR=${SHAREDIR}/man/				      #Directory where manpages are installed.
+INITDIR=/etc/init.d				      #Directory where SysV init scripts are installed.
+INITFILE=					      #Name of the product's SysV init script
+INITSOURCE=init.suse.sh				      #Name of the distributed file to be installed as the SysV init script
+ANNOTATED=					      #If non-zero, annotated configuration files are installed
+SERVICEDIR=/usr/lib/systemd/system		      #Directory where .service files are installed (systems running systemd only)
+SERVICEFILE=$PRODUCT.service			      #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
+SYSCONFFILE=sysconfig				      #Name of the distributed file to be installed in $SYSCONFDIR
+SYSCONFDIR=/etc/sysconfig/			      #Directory where SysV init parameter files are installed
+SPARSE=						      #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=/var/lib					      #Directory where persistent product data is stored.
+VARDIR=${VARLIB}/$PRODUCT			      #Directory where product variable data is stored.
+DEFAULT_PAGER=					      #Pager to use if none specified in shorewall[6].conf
+SHARED_CONFIG=					      #Configuration serves both Shorewall and Shorewall6