diff --git a/mozilla/security/tinderlight/config.sh b/mozilla/security/tinderlight/config.sh
new file mode 100755
index 00000000000..56b64a9c791
--- /dev/null
+++ b/mozilla/security/tinderlight/config.sh
@@ -0,0 +1,17 @@
+#! /bin/bash
+
+#### LOCAL MACHINE SETTINGS ####
+
+# example configuration
+case ${HOST} in
+host1) 
+    JAVA_HOME_64=/opt/jdk/1.6.0_01/SunOS64
+    JAVA_HOME_32=/opt/jdk/1.6.0_01/SunOS
+    ;;
+host2)
+    run_bits="32"
+    export NSS_TESTS=memleak
+    NO_JSS=1
+    ;;
+esac
+
diff --git a/mozilla/security/tinderlight/env.sh b/mozilla/security/tinderlight/env.sh
index a5c37a17cac..7fad1bcda89 100644
--- a/mozilla/security/tinderlight/env.sh
+++ b/mozilla/security/tinderlight/env.sh
@@ -59,20 +59,9 @@ run_bits="32 64"
 run_opt="DBG OPT"
 BRANCH="trunk"
 
-#### LOCAL MACHINE SETTINGS ####
+### CONFIG.SH CONTAINS CONFIGURATIONS OF ALL MACHINES ###
 
-# used example configurations only
-case ${HOST} in
-host1) 
-    JAVA_HOME_64=/opt/jdk/1.6.0_01/SunOS64
-    JAVA_HOME_32=/opt/jdk/1.6.0_01/SunOS
-    ;;
-host2)
-    run_bits="32"
-    export NSS_TESTS=memleak
-    NO_JSS=1
-    ;;
-esac
+. config.sh
 
 RUN_BITS="${RUN_BITS:-$run_bits}"
 RUN_OPT="${RUN_OPT:-$run_opt}"