diff --git a/Shorewall/lib.config b/Shorewall/lib.config
index 34ab9b8db..fe2903ac9 100644
--- a/Shorewall/lib.config
+++ b/Shorewall/lib.config
@@ -1732,7 +1732,8 @@ do_initialize() {
     USE_ACTIONS=
     OPTIMIZE=
     EXPORTPARAMS=
-    EXPERIMENTAL=
+    #EXPERIMENTAL is inherited
+
     #
     # Packet Disposition
     #
@@ -1786,8 +1787,12 @@ do_initialize() {
 
     [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
 
+    [ -n "$EXPERIMENTAL" ] && set -a; 
+    
     run_user_exit params
 
+    [ -n "$EXPERIMENTAL" ] && set +a && EXPERIMENTAL=
+
     config=$(find_file shorewall.conf)
 
     if [ -f $config ]; then
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index c91ed24f8..750772753 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -214,6 +214,16 @@ get_config() {
 
     [ -n "${HOSTNAME:=$(hostname)}" ]
 
+    case "$EXPERIMENTAL" in 
+	yes|Yes)
+	    ;;
+	*)
+	    EXPERIMENTAL=
+	    ;;
+    esac
+    
+    export EXPERIMENTAL;
+
 }
 
 #