diff --git a/Shorewall-core/lib.base b/Shorewall-core/lib.base
index 76aeeb94f..ab6e2947e 100644
--- a/Shorewall-core/lib.base
+++ b/Shorewall-core/lib.base
@@ -42,8 +42,8 @@ if [ -z "$g_readrc" ]; then
 	. /root/.shorewallrc || exit 1
     elif [ -f ~/.shorewallrc ]; then
 	. ~/.shorewallrc || exit 1
-    elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
-	. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1
+    elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
+	. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
     else
 	SHAREDIR=/usr/share
 	CONFDIR=/etc
diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
index d44cf111b..2d6366e76 100644
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -33,8 +33,8 @@ if [ -z "$g_readrc" ]; then
 	. /root/.shorewallrc || exit 1
     elif [ -r /.shorewallrc ]; then
 	. /root/.shorewallrc || exit 1
-    elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
-	. ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1
+    elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
+	. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
     else
 	SHAREDIR=/usr/share
 	CONFDIR=${CONFDIR}
diff --git a/Shorewall-init/shorewall-init b/Shorewall-init/shorewall-init
index 4a190899c..5ea9a304e 100644
--- a/Shorewall-init/shorewall-init
+++ b/Shorewall-init/shorewall-init
@@ -31,8 +31,8 @@ elif [ -r /root/.shorewallrc ]; then
     . /root/.shorewallrc || exit 1
 elif [ -r /.shorewallrc ]; then
     . /root/.shorewallrc || exit 1
-elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
-    . ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1
+elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
+    . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
 else
     VARDIR=/var/lib
     LIBEXECDIR=/usr/share
diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite
index bbad1fbde..399bcc22d 100755
--- a/Shorewall-lite/shorewall-lite
+++ b/Shorewall-lite/shorewall-lite
@@ -35,8 +35,8 @@ elif [ -r /root/.shorewallrc ]; then
     . /root/.shorewallrc || exit 1
 elif [ -r /.shorewallrc ]; then
     . /root/.shorewallrc || exit 1
-elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
-    . ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1
+elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
+    . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
 else
     SHAREDIR=/usr/share
     CONFDIR=${CONFDIR}
diff --git a/Shorewall/Perl/prog.footer b/Shorewall/Perl/prog.footer
index 9ebff0aa5..71dab33df 100644
--- a/Shorewall/Perl/prog.footer
+++ b/Shorewall/Perl/prog.footer
@@ -101,7 +101,10 @@ else
     VARDIR=/var/lib
 fi
 
-[ -n "$TMPDIR" ] && export TMPDIR
+if [ -n "$TEMPDIR" ]; then
+    TMPDIR="$TEMPDIR"
+    export TMPDIR
+fi
 
 initialize
 
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 5bcc979bc..808b4b731 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -36,7 +36,7 @@ elif [ -r /root/.shorewallrc ]; then
 elif [ -r /.shorewallrc ]; then
     . /root/.shorewallrc || exit 1
 elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
-    . ${SHOREAWLLRC_HOME}/.shorewallrc || exit 1
+    . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
 else
     SHAREDIR=/usr/share
     CONFDIR=${CONFDIR}
diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite
index f38677915..76cb4085e 100755
--- a/Shorewall6-lite/shorewall6-lite
+++ b/Shorewall6-lite/shorewall6-lite
@@ -27,8 +27,16 @@
 ################################################################################################
 g_program=shorewall6-lite
 
-if [ -f ~/.shorewallrc ]; then
+if [ -f ./.shorewallrc ]; then
+    . ./.shorewallrc || exit 1
+elif [ -f ~/.shorewallrc ]; then
     . ~/.shorewallrc || exit 1
+elif [ -r /root/.shorewallrc ]; then
+    . /root/.shorewallrc || exit 1
+elif [ -r /.shorewallrc ]; then
+    . /root/.shorewallrc || exit 1
+elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
+    . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
 else
     SHAREDIR=/usr/share
     CONFDIR=${CONFDIR}