diff --git a/src/main/resources/scripts/gvm-common.sh b/src/main/resources/scripts/gvm-common.sh
index db954d6a..edfe8838 100644
--- a/src/main/resources/scripts/gvm-common.sh
+++ b/src/main/resources/scripts/gvm-common.sh
@@ -21,17 +21,6 @@
 # common internal function definitions
 #
 
-function __gvmtool_help {
-	echo ""
-	echo "Usage: gvm <command> <candidate> [version]"
-	echo ""
-	echo "   command    :  install, uninstall, list, use, current, version, default, selfupdate, broadcast or help"
-	echo "   candidate  :  groovy, grails, griffon, gradle, vert.x"
-	echo "   version    :  optional, defaults to latest stable if not provided"
-	echo ""
-	echo "eg: gvm install groovy"
-}
-
 function __gvmtool_check_candidate_present {
 	if [ -z "$1" ]; then
 		echo -e "\nNo candidate provided."
diff --git a/src/main/resources/scripts/gvm-help.sh b/src/main/resources/scripts/gvm-help.sh
new file mode 100644
index 00000000..74d21cd3
--- /dev/null
+++ b/src/main/resources/scripts/gvm-help.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+#
+#   Copyright 2012 Marco Vermeulen
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+function __gvmtool_help {
+	echo ""
+	echo "Usage: gvm <command> <candidate> [version]"
+	echo ""
+	echo "   command    :  install, uninstall, list, use, current, version, default, selfupdate, broadcast or help"
+	echo "   candidate  :  groovy, grails, griffon, gradle, vert.x"
+	echo "   version    :  optional, defaults to latest stable if not provided"
+	echo ""
+	echo "eg: gvm install groovy"
+}
diff --git a/src/test/resources/gvm/upgrade_steps.groovy b/src/test/resources/gvm/upgrade_steps.groovy
index aef2fb83..b3b7f680 100644
--- a/src/test/resources/gvm/upgrade_steps.groovy
+++ b/src/test/resources/gvm/upgrade_steps.groovy
@@ -42,6 +42,7 @@ And(~'^the gvm module scripts are placed in the src folder$') {->
     assert new File("$gvmDir/src", "gvm-uninstall.sh").exists()
     assert new File("$gvmDir/src", "gvm-use.sh").exists()
     assert new File("$gvmDir/src", "gvm-version.sh").exists()
+    assert new File("$gvmDir/src", "gvm-help.sh").exists()
 }
 
 And(~'^the staging folder is cleaned up$') {->