diff --git a/Tools/bin/ContextTool b/Tools/bin/ContextTool
index 3bd23112a8..c67933eaa6 100755
--- a/Tools/bin/ContextTool
+++ b/Tools/bin/ContextTool
@@ -1,15 +1,15 @@
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution.  The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# 
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-
-export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/bin/ContextTool.jar
-
-# Run Framework Wizard
-java org.tianocore.context.ContextMain
+#!/bin/sh
+#
+# Copyright (c) 2006, Intel Corporation
+# All rights reserved. This program and the accompanying materials
+# are licensed and made available under the terms and conditions of the BSD License
+# which accompanies this distribution.  The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php
+# 
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+# export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/ContextTool.jar
+
+# Run Framework Wizard
+java -cp ${WORKSPACE}/Tools/Jars/ContextTool.jar org.tianocore.context.ContextMain $@