diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite
index 1f5f07ea4..4ca3b3f58 100755
--- a/Shorewall-lite/shorewall-lite
+++ b/Shorewall-lite/shorewall-lite
@@ -28,7 +28,7 @@
 g_program=shorewall-lite
 
 #
-# This is modified by the installer when ${SHAREDIR} <> /usr/share
+# This is modified by the installer when ${SHAREDIR} != /usr/share
 #
 . /usr/share/shorewall/shorewallrc
 
diff --git a/Shorewall/Perl/getparams b/Shorewall/Perl/getparams
index 38472af6a..6e2bc5d89 100755
--- a/Shorewall/Perl/getparams
+++ b/Shorewall/Perl/getparams
@@ -33,22 +33,19 @@ else
     g_program=shorewall
 fi
 
-if [ -f ~/.shorewallrc ]; then
-    . ~/.shorewallrc || exit 1
-else
-    SHAREDIR=/usr/share
-    CONFDIR=${CONFDIR}
-    SBINDIR=/sbin
-    VARDIR=/var/lib
-    LIBEXECDIR=/usr/share
-fi
+#
+# This is modified by the installer when ${SHAREDIR} != /usr/share
+#
+. /usr/share/shorewall/shorewallrc
 
 g_libexec="$LIBEXECDIR"
-g_sharedir="$SHAREDIR"
+g_sharedir="$SHAREDIR"/shorewall
 g_sbindir="$SBINDIR"
+g_perllib="$PERLLIBDIR"
+g_confdir="$CONFDIR"/shorewall
 g_readrc=1
 
-. $g_sharedir/shorewall/lib.cli
+. $g_sharedir/lib.cli
 
 CONFIG_PATH="$2"
 
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index f6b644947..a73e57215 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -1016,6 +1016,7 @@ if [ -d Perl ]; then
     # Install the params file helper
     #
     install_file getparams ${DESTDIR}${LIBEXECDIR}/$PRODUCT/getparams 0755
+    [ $SHAREDIR = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${LIBEXECDIR}/$PRODUCT/getparams
 
     echo
     echo "Params file helper installed in ${DESTDIR}${LIBEXECDIR}/$PRODUCT/getparams"
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index c2a7dbea9..3fb3f1522 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -28,7 +28,7 @@
 g_program=shorewall
 
 #
-# This is modified by the installer when ${SHAREDIR} <> /usr/share
+# This is modified by the installer when ${SHAREDIR} != /usr/share
 #
 . /usr/share/shorewall/shorewallrc
 
diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite
index 6a975bc32..688d1ec34 100755
--- a/Shorewall6-lite/shorewall6-lite
+++ b/Shorewall6-lite/shorewall6-lite
@@ -28,7 +28,7 @@
 g_program=shorewall6-lite
 
 #
-# This is modified by the installer when ${SHAREDIR} <> /usr/share
+# This is modified by the installer when ${SHAREDIR} != /usr/share
 #
 . /usr/share/shorewall/shorewallrc
 
diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6
index 456dffdcf..73034269c 100755
--- a/Shorewall6/shorewall6
+++ b/Shorewall6/shorewall6
@@ -28,7 +28,7 @@
 g_program=shorewall6
 
 #
-# This is modified by the installer when ${SHAREDIR} <> /usr/share
+# This is modified by the installer when ${SHAREDIR} != /usr/share
 #
 . /usr/share/shorewall/shorewallrc