diff -ur shorewall-5.2.1.orig/shorewall/configfiles/shorewall.conf shorewall-5.2.1/shorewall/configfiles/shorewall.conf
--- shorewall-5.2.1.orig/shorewall/configfiles/shorewall.conf	2018-10-11 21:39:19.903033000 +0000
+++ shorewall-5.2.1/shorewall/configfiles/shorewall.conf	2018-10-11 21:40:46.292033000 +0000
@@ -49,9 +49,9 @@
 
 LOGALLNEW=
 
-LOGFILE=/var/log/messages
+LOGFILE=/var/log/shorewall
 
-LOGFORMAT="%s %s "
+LOGFORMAT="Shorewall:%s:%s "
 
 LOGTAGONLY=No
 
@@ -67,7 +67,7 @@
 
 SMURF_LOG_LEVEL="$LOG_LEVEL"
 
-STARTUP_LOG=/var/log/shorewall-init.log
+STARTUP_LOG=/var/log/shorewall-init
 
 TCP_FLAGS_LOG_LEVEL="$LOG_LEVEL"
 
diff -ur shorewall-5.2.1.orig/shorewall/install.sh shorewall-5.2.1/shorewall/install.sh
--- shorewall-5.2.1.orig/shorewall/install.sh	2018-10-02 15:21:54.000000000 +0000
+++ shorewall-5.2.1/shorewall/install.sh	2018-10-11 21:40:46.293033000 +0000
@@ -1223,8 +1223,8 @@
 fi
 
 if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
-    run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}
-    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}"
+    run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init
+    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init"
 fi
 
 #
@@ -1262,7 +1262,7 @@
 	    echo "${PRODUCT} will start automatically at boot"
 	    if [ $HOST = debian ]; then
 		echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
-		touch /var/log/${PRODUCT}-init.log
+		touch /var/log/${PRODUCT}-init
 		perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
 	    else
 		echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable"
@@ -1281,7 +1281,7 @@
     elif mywhich update-rc.d ; then
 	echo "${PRODUCT} will start automatically at boot"
 	echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
-	touch /var/log/${PRODUCT}-init.log
+	touch /var/log/${PRODUCT}-init
 	perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
 	update-rc.d ${PRODUCT} enable
     elif mywhich rc-update ; then
@@ -1289,7 +1289,7 @@
 	    echo "${PRODUCT} will start automatically at boot"
 	    if [ $HOST = debian ]; then
 		echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
-		touch /var/log/${PRODUCT}-init.log
+		touch /var/log/${PRODUCT}-init
 		perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
 	    else
 		echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable"
diff -ur shorewall-5.2.1.orig/shorewall/logrotate shorewall-5.2.1/shorewall/logrotate
--- shorewall-5.2.1.orig/shorewall/logrotate	2018-10-02 15:15:20.000000000 +0000
+++ shorewall-5.2.1/shorewall/logrotate	2018-10-11 21:40:46.293033000 +0000
@@ -1,4 +1,4 @@
-/var/log/shorewall-init.log {
+/var/log/shorewall-init {
   missingok
   notifempty
   create 0600 root root
diff -ur shorewall-5.2.1.orig/shorewall/uninstall.sh shorewall-5.2.1/shorewall/uninstall.sh
--- shorewall-5.2.1.orig/shorewall/uninstall.sh	2018-10-02 15:21:54.000000000 +0000
+++ shorewall-5.2.1/shorewall/uninstall.sh	2018-10-11 21:40:46.293033000 +0000
@@ -216,7 +216,7 @@
     esac
 done
 
-remove_file  ${CONFDIR}/logrotate.d/$PRODUCT
+remove_file  ${CONFDIR}/logrotate.d/$PRODUCT-init
 
 [ -n "$SYSTEMD" ] && remove_file ${SYSTEMD}/${PRODUCT}.service
 
diff -ur shorewall-5.2.1.orig/shorewall6/configfiles/shorewall6.conf shorewall-5.2.1/shorewall6/configfiles/shorewall6.conf
--- shorewall-5.2.1.orig/shorewall6/configfiles/shorewall6.conf	2018-10-11 21:39:19.903033000 +0000
+++ shorewall-5.2.1/shorewall6/configfiles/shorewall6.conf	2018-10-11 21:40:46.293033000 +0000
@@ -48,9 +48,9 @@
 
 LOGALLNEW=
 
-LOGFILE=/var/log/messages
+LOGFILE=/var/log/shorewall
 
-LOGFORMAT="%s %s "
+LOGFORMAT="Shorewall:%s:%s "
 
 LOGLIMIT="s:1/sec:10"
 
@@ -66,7 +66,7 @@
 
 SMURF_LOG_LEVEL="$LOG_LEVEL"
 
-STARTUP_LOG=/var/log/shorewall6-init.log
+STARTUP_LOG=/var/log/shorewall6-init
 
 TCP_FLAGS_LOG_LEVEL="$LOG_LEVEL"
 
diff -ur shorewall-5.2.1.orig/shorewall6/install.sh shorewall-5.2.1/shorewall6/install.sh
--- shorewall-5.2.1.orig/shorewall6/install.sh	2018-10-02 15:21:54.000000000 +0000
+++ shorewall-5.2.1/shorewall6/install.sh	2018-10-11 21:40:46.293033000 +0000
@@ -1223,8 +1223,8 @@
 fi
 
 if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
-    run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}
-    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}"
+    run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init
+    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init"
 fi
 
 #
@@ -1262,7 +1262,7 @@
 	    echo "${PRODUCT} will start automatically at boot"
 	    if [ $HOST = debian ]; then
 		echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
-		touch /var/log/${PRODUCT}-init.log
+		touch /var/log/${PRODUCT}-init
 		perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
 	    else
 		echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable"
@@ -1281,7 +1281,7 @@
     elif mywhich update-rc.d ; then
 	echo "${PRODUCT} will start automatically at boot"
 	echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
-	touch /var/log/${PRODUCT}-init.log
+	touch /var/log/${PRODUCT}-init
 	perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
 	update-rc.d ${PRODUCT} enable
     elif mywhich rc-update ; then
@@ -1289,7 +1289,7 @@
 	    echo "${PRODUCT} will start automatically at boot"
 	    if [ $HOST = debian ]; then
 		echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
-		touch /var/log/${PRODUCT}-init.log
+		touch /var/log/${PRODUCT}-init
 		perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
 	    else
 		echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable"
diff -ur shorewall-5.2.1.orig/shorewall6/logrotate shorewall-5.2.1/shorewall6/logrotate
--- shorewall-5.2.1.orig/shorewall6/logrotate	2018-10-02 15:15:20.000000000 +0000
+++ shorewall-5.2.1/shorewall6/logrotate	2018-10-11 21:40:46.294033000 +0000
@@ -1,4 +1,4 @@
-/var/log/shorewall6-init.log {
+/var/log/shorewall6-init {
   missingok
   notifempty
   create 0600 root root
diff -ur shorewall-5.2.1.orig/shorewall6/uninstall.sh shorewall-5.2.1/shorewall6/uninstall.sh
--- shorewall-5.2.1.orig/shorewall6/uninstall.sh	2018-10-02 15:21:54.000000000 +0000
+++ shorewall-5.2.1/shorewall6/uninstall.sh	2018-10-11 21:40:46.294033000 +0000
@@ -216,7 +216,7 @@
     esac
 done
 
-remove_file  ${CONFDIR}/logrotate.d/$PRODUCT
+remove_file  ${CONFDIR}/logrotate.d/$PRODUCT-init
 
 [ -n "$SYSTEMD" ] && remove_file ${SYSTEMD}/${PRODUCT}.service
 
diff -ur shorewall-5.2.1.orig/shorewall6-lite/install.sh shorewall-5.2.1/shorewall6-lite/install.sh
--- shorewall-5.2.1.orig/shorewall6-lite/install.sh	2018-10-02 15:21:54.000000000 +0000
+++ shorewall-5.2.1/shorewall6-lite/install.sh	2018-10-11 21:40:46.294033000 +0000
@@ -467,8 +467,8 @@
 fi
 
 if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
-    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT 0644
-    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT"
+    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init 0644
+    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init"
 fi
 
 #
@@ -518,7 +518,7 @@
 	    echo "$PRODUCT will start automatically at boot"
 	    if [ $HOST = debian ]; then
 		echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
-		touch /var/log/$PRODUCT-init.log
+		touch /var/log/$PRODUCT-init
 		perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
 	    else
 		echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable"
@@ -537,7 +537,7 @@
     elif mywhich update-rc.d ; then
 	echo "$PRODUCT will start automatically at boot"
 	echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
-	touch /var/log/$PRODUCT-init.log
+	touch /var/log/$PRODUCT-init
 	perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
 	update-rc.d $PRODUCT enable
     elif mywhich rc-update ; then
@@ -545,7 +545,7 @@
 	    echo "$PRODUCT will start automatically at boot"
 	    if [ $HOST = debian ]; then
 		echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
-		touch /var/log/$PRODUCT-init.log
+		touch /var/log/$PRODUCT-init
 		perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
 	    else
 		echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable"
diff -ur shorewall-5.2.1.orig/shorewall6-lite/logrotate shorewall-5.2.1/shorewall6-lite/logrotate
--- shorewall-5.2.1.orig/shorewall6-lite/logrotate	2018-10-02 15:15:20.000000000 +0000
+++ shorewall-5.2.1/shorewall6-lite/logrotate	2018-10-11 21:40:46.294033000 +0000
@@ -1,4 +1,4 @@
-/var/log/shorewall6-lite-init.log {
+/var/log/shorewall6-lite-init {
   missingok
   notifempty
   create 0600 root root
diff -ur shorewall-5.2.1.orig/shorewall6-lite/uninstall.sh shorewall-5.2.1/shorewall6-lite/uninstall.sh
--- shorewall-5.2.1.orig/shorewall6-lite/uninstall.sh	2018-10-02 15:21:54.000000000 +0000
+++ shorewall-5.2.1/shorewall6-lite/uninstall.sh	2018-10-11 21:40:46.294033000 +0000
@@ -190,7 +190,7 @@
 remove_directory ${VARDIR}
 remove_directory ${SHAREDIR}/$PRODUCT
 remove_directory ${LIBEXECDIR}/$PRODUCT
-remove_file  ${CONFDIR}/logrotate.d/$PRODUCT
+remove_file  ${CONFDIR}/logrotate.d/$PRODUCT-init
 
 if [ -n "$SYSCONFDIR" ]; then
     [ -n "$SYSCONFFILE" ] && remove_file ${SYSCONFDIR}/${PRODUCT}
diff -ur shorewall-5.2.1.orig/shorewall-init/install.sh shorewall-5.2.1/shorewall-init/install.sh
--- shorewall-5.2.1.orig/shorewall-init/install.sh	2018-10-02 15:21:54.000000000 +0000
+++ shorewall-5.2.1/shorewall-init/install.sh	2018-10-11 21:40:46.294033000 +0000
@@ -336,8 +336,8 @@
 # Install logrotate file
 #
 if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
-    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT 0644
-    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT"
+    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/shorewall-ifupdown 0644
+    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/shorewall-ifupdown"
 fi
 
 #
diff -ur shorewall-5.2.1.orig/shorewall-init/logrotate shorewall-5.2.1/shorewall-init/logrotate
--- shorewall-5.2.1.orig/shorewall-init/logrotate	2018-10-02 15:15:20.000000000 +0000
+++ shorewall-5.2.1/shorewall-init/logrotate	2018-10-11 21:40:46.294033000 +0000
@@ -1,4 +1,4 @@
-/var/log/shorewall-ifupdown.log {
+/var/log/shorewall-ifupdown {
   missingok
   notifempty
   create 0600 root root
diff -ur shorewall-5.2.1.orig/shorewall-init/sysconfig shorewall-5.2.1/shorewall-init/sysconfig
--- shorewall-5.2.1.orig/shorewall-init/sysconfig	2018-10-02 15:15:20.000000000 +0000
+++ shorewall-5.2.1/shorewall-init/sysconfig	2018-10-11 21:40:46.295033000 +0000
@@ -19,7 +19,7 @@
 #
 # Where Up/Down events get logged
 #
-LOGFILE=/var/log/shorewall-ifupdown.log
+LOGFILE=/var/log/shorewall-ifupdown
 
 # Startup options - set verbosity to 0 (minimal reporting)
 OPTIONS="-V0"
diff -ur shorewall-5.2.1.orig/shorewall-init/uninstall.sh shorewall-5.2.1/shorewall-init/uninstall.sh
--- shorewall-5.2.1.orig/shorewall-init/uninstall.sh	2018-10-02 15:21:54.000000000 +0000
+++ shorewall-5.2.1/shorewall-init/uninstall.sh	2018-10-11 21:40:46.295033000 +0000
@@ -202,7 +202,7 @@
 
 remove_directory ${SHAREDIR}/$PRODUCT
 remove_directory ${LIBEXECDIR}/$PRODUCT
-remove_file  ${CONFDIR}/logrotate.d/$PRODUCT
+remove_file  ${CONFDIR}/logrotate.d/shorewall-ifupdown
 
 #
 # Report Success
diff -ur shorewall-5.2.1.orig/shorewall-lite/install.sh shorewall-5.2.1/shorewall-lite/install.sh
--- shorewall-5.2.1.orig/shorewall-lite/install.sh	2018-10-02 15:21:54.000000000 +0000
+++ shorewall-5.2.1/shorewall-lite/install.sh	2018-10-11 21:40:46.295033000 +0000
@@ -467,8 +467,8 @@
 fi
 
 if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
-    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT 0644
-    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT"
+    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init 0644
+    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init"
 fi
 
 #
@@ -518,7 +518,7 @@
 	    echo "$PRODUCT will start automatically at boot"
 	    if [ $HOST = debian ]; then
 		echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
-		touch /var/log/$PRODUCT-init.log
+		touch /var/log/$PRODUCT-init
 		perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
 	    else
 		echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable"
@@ -537,7 +537,7 @@
     elif mywhich update-rc.d ; then
 	echo "$PRODUCT will start automatically at boot"
 	echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
-	touch /var/log/$PRODUCT-init.log
+	touch /var/log/$PRODUCT-init
 	perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
 	update-rc.d $PRODUCT enable
     elif mywhich rc-update ; then
@@ -545,7 +545,7 @@
 	    echo "$PRODUCT will start automatically at boot"
 	    if [ $HOST = debian ]; then
 		echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
-		touch /var/log/$PRODUCT-init.log
+		touch /var/log/$PRODUCT-init
 		perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
 	    else
 		echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable"
diff -ur shorewall-5.2.1.orig/shorewall-lite/logrotate shorewall-5.2.1/shorewall-lite/logrotate
--- shorewall-5.2.1.orig/shorewall-lite/logrotate	2018-10-02 15:15:20.000000000 +0000
+++ shorewall-5.2.1/shorewall-lite/logrotate	2018-10-11 21:40:46.295033000 +0000
@@ -1,4 +1,4 @@
-/var/log/shorewall-lite-init.log {
+/var/log/shorewall-lite-init {
   missingok
   notifempty
   create 0600 root root
diff -ur shorewall-5.2.1.orig/shorewall-lite/uninstall.sh shorewall-5.2.1/shorewall-lite/uninstall.sh
--- shorewall-5.2.1.orig/shorewall-lite/uninstall.sh	2018-10-02 15:21:54.000000000 +0000
+++ shorewall-5.2.1/shorewall-lite/uninstall.sh	2018-10-11 21:40:46.295033000 +0000
@@ -190,7 +190,7 @@
 remove_directory ${VARDIR}
 remove_directory ${SHAREDIR}/$PRODUCT
 remove_directory ${LIBEXECDIR}/$PRODUCT
-remove_file  ${CONFDIR}/logrotate.d/$PRODUCT
+remove_file  ${CONFDIR}/logrotate.d/$PRODUCT-init
 
 if [ -n "$SYSCONFDIR" ]; then
     [ -n "$SYSCONFFILE" ] && remove_file ${SYSCONFDIR}/${PRODUCT}