diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl
index 71b9d7bcc98..f1cd746f00a 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl
@@ -47,7 +47,7 @@ else
     {
 		print("success\n");
 		
-		system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
+		system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
 		1;
     }
     else
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh
index 7eecdd7b720..80fa0e7e692 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh
@@ -6,4 +6,4 @@ export serverpath=.;
 export PATH=/usr/java131/jre/bin:$PATH
 export CLASSPATH=/usr/java131/jre/lib/rt.jar:/usr/jdk_base/lib/classes.zip:$CLASSPATH
 export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
-java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false com.ibm.etools.systems.dstore.core.server.Server 0 60000 &
\ No newline at end of file
+java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true com.ibm.etools.systems.dstore.core.server.Server 0 60000 &
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl
index 7d857b0410c..01f7fb3316d 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl
@@ -55,7 +55,7 @@ else
 			$suOptions="-";
 		}
 
-		system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
+		system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
 			1;
     }
     else
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl
index 93e6cb271ae..f7aabaffc12 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl
@@ -32,17 +32,17 @@ if (!defined($packaged_as))
 
 if (!defined($timeout))
 {
-	system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH org.eclipse.dstore.core.server.Server $port");
+	system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $port");
 }
 else
 {
 	if (!defined($clientUserID))
 	{
-		system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH org.eclipse.dstore.core.server.Server $port $timeout");
+		system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $port $timeout");
 	}
 	else
 	{
-		system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -Dclient.username=$clientUserID org.eclipse.dstore.core.server.Server $port $timeout");
+		system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -Dclient.username=$clientUserID -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $port $timeout");
 	}
 }
 
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl
index 87009b9e2d3..e4c81ab1ed4 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl
@@ -55,7 +55,7 @@ else
 			$suOptions="-";
 		}
 
-		system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
+		system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
 		1;
     }
     else
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh
index ee82a511904..9743bdb3420 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh
@@ -4,6 +4,6 @@
 export serverpath=.;
 export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
 if [ $1 ]                     
-then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 org.eclipse.dstore.core.server.Server 0 60000 &
-else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false org.eclipse.dstore.core.server.Server 0 60000 &
+then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 &
+else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 &
 fi
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat
index fe8c378b44f..d27b96e8da0 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat
@@ -12,12 +12,12 @@ if xxx%3 == xxx goto runNoTicket
 
 @echo on
 
-java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT% %TICKET%
+java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT% %TICKET%
 goto done
 
 :runNoTicket
 @echo on
-java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT%
+java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT%
 goto done
 
 :usage