diff --git a/Shorewall6/lib.base b/Shorewall6/lib.base
index 9c3579e85..aa5d85753 100644
--- a/Shorewall6/lib.base
+++ b/Shorewall6/lib.base
@@ -38,7 +38,7 @@ SHOREWALL_CAPVERSION=40205
 [ -n "${VARDIR:=/var/lib/shorewall6}" ]
 [ -n "${SHAREDIR:=/usr/share/shorewall6}" ]
 [ -n "${CONFDIR:=/etc/shorewall6}" ]
-PERLSHAREDIR=/usr/share/shorewall-perl
+PERLSHAREDIR=/usr/share/shorewall
 
 #
 # Message to stderr
diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6
index 35dce695a..d5b297556 100755
--- a/Shorewall6/shorewall6
+++ b/Shorewall6/shorewall6
@@ -302,9 +302,6 @@ get_config() {
 # Run the appropriate compiler
 #
 compiler() {
-    local sc
-    sc=${SHELLSHAREDIR}/compiler
-    local pc
     pc=${PERLSHAREDIR}/compiler.pl
 
     startup_error() {
@@ -360,7 +357,7 @@ compiler() {
     [ -n "$TEST" ] && options="$options --test"
     [ "$debugging" = trace ] && options="$options --debug"
     [ -n "$REFRESHCHAINS" ] && options="$options --refresh=$REFRESHCHAINS"
-    [ -x $pc ] || startup_error "Shorewall6 requires the shorewall-perl package which is not installed"
+    [ -x $pc ] || startup_error "Shorewall6 requires the shorewall package which is not installed"
     #
     # Run the appropriate params file
     #
@@ -1319,7 +1316,7 @@ usage() # $1 = exit status
     echo "   export [ <directory1> ] [<user>@]<system>[:<directory2>]"
     echo "   forget [ <file name> ]"
     echo "   help"
-    echo "   load [ -s ] [ -c ] [ -r <root user> ] [ -C {shell|perl} ] [ <directory> ] <system>"
+    echo "   load [ -s ] [ -c ] [ -r <root user> ] [ <directory> ] <system>"
     echo "   logdrop <address> ..."
     echo "   logreject <address> ..."
     echo "   logwatch [<refresh interval>]"
@@ -1334,10 +1331,10 @@ usage() # $1 = exit status
     echo "   start [ -f ] [ -n ] [ -p ] [ <directory> ]"
     echo "   stop [ -f ]"
     echo "   status"
-    echo "   try [ -C {shell|perl} ] <directory> [ <timeout> ]"
+    echo "   try <directory> [ <timeout> ]"
     echo "   version [ -a ]"
-    echo "   safe-start [ -C {shell|perl} ] [ <directory> ]"
-    echo "   safe-restart [ -C {shell|perl} ] [ <directory> ]"
+    echo "   safe-start [ <directory> ]"
+    echo "   safe-restart [ <directory> ]"
     echo
     exit $1
 }
@@ -1505,8 +1502,8 @@ version_command() {
     echo $version
 
     if [ -n "$all" ]; then
-	if [ -f /usr/share/shorewall-perl/version ]; then
-	    echo "Shorewall-perl $(cat /usr/share/shorewall-perl/version)"
+	if [ -f /usr/share/shorewall/version ]; then
+	    echo "Shorewall $(cat /usr/share/shorewall/version)"
 	fi
     fi
 }