diff --git a/Shorewall/compiler b/Shorewall/compiler
index 3b404c143..db8217e46 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -5668,13 +5668,13 @@ case "$COMMAND" in
     check)
 	[ $# -ne 1 ] && usage
 	do_initialize
-	[ -n "$EXPERIMENTAL" ] && exec perl $debug $(find_file compiler.pl) || compile_firewall
+	[ -n "$SHOREWALL4" ] && exec perl $debug /usr/share/shorewall4/compiler.pl || compile_firewall
 	;;
 
     compile)
 	[ $# -ne 2 ] && usage
 	do_initialize
-	[ -n "$EXPERIMENTAL" ] && exec perl $debug $(find_file compiler.pl) $2 || compile_firewall $2
+	[ -n "$SHOREWALL4" ] && exec perl $debug /usr/share/shorewall4/compiler.pl $2 || compile_firewall $2
 	;;
 
     call)
diff --git a/Shorewall/lib.base b/Shorewall/lib.base
index 8c7a9a336..b09193a65 100644
--- a/Shorewall/lib.base
+++ b/Shorewall/lib.base
@@ -339,7 +339,7 @@ lib_load() # $1 = Name of the Library, $2 = Error Message heading if the library
     eval loaded=\$LIB_${1}_LOADED
 
     if [ -z "$loaded" ]; then
-	if [ -n "$EXPERIMENTAL" ]; then
+	if [ -n "$SHOREWALL4" ]; then
 	    eval LIB_${1}_LOADED=Yes
 	    return
 	fi
diff --git a/Shorewall/lib.config b/Shorewall/lib.config
index fe2903ac9..0bb53e151 100644
--- a/Shorewall/lib.config
+++ b/Shorewall/lib.config
@@ -1787,11 +1787,11 @@ do_initialize() {
 
     [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
 
-    [ -n "$EXPERIMENTAL" ] && set -a; 
+    [ -d /usr/share/shorewall4 ] && set -a; 
     
     run_user_exit params
 
-    [ -n "$EXPERIMENTAL" ] && set +a && EXPERIMENTAL=
+    [ -d /usr/share/shorewall4 ] && set +a
 
     config=$(find_file shorewall.conf)
 
@@ -1962,7 +1962,7 @@ do_initialize() {
     TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT)
     USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS)
     EXPORTPARAMS=$(added_param_value_yes EXPORTPARAMS $EXPORTPARAMS)
-    EXPERIMENTAL=$(added_param_value_no EXPERIMENTAL $EXPERIMENTAL)
+    SHOREWALL4=$(added_param_value_no SHOREWALL4 $SHOREWALL4)
 
     [ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
 
@@ -2108,7 +2108,7 @@ do_initialize() {
 	strip_file_and_lib_load tcrules tcrules
 	strip_file tos
 	strip_file_and_lib_load tunnels tunnels
-	if [ -n $EXPERIMENTAL ]; then
+	if [ -n "$SHOREWALL4" ]; then
 	    report_capabilities1 > $TMP_DIR/capabilities
 	    export TMP_DIR
 	    export CONFIG_PATH
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 750772753..c91ed24f8 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -214,16 +214,6 @@ get_config() {
 
     [ -n "${HOSTNAME:=$(hostname)}" ]
 
-    case "$EXPERIMENTAL" in 
-	yes|Yes)
-	    ;;
-	*)
-	    EXPERIMENTAL=
-	    ;;
-    esac
-    
-    export EXPERIMENTAL;
-
 }
 
 #