diff --git a/scripts/Cleanup b/bin/sde-cleanup
similarity index 95%
rename from scripts/Cleanup
rename to bin/sde-cleanup
index 333fc88..2ad2680 100755
--- a/scripts/Cleanup
+++ b/bin/sde-cleanup
@@ -2,7 +2,7 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# Filename: scripts/Cleanup
+# Filename: bin/sde-cleanup
 # Copyright (C) 2006 - 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
@@ -14,9 +14,15 @@
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
-#
-# Cleanup the build environment 
-#
+
+#Description: Cleanup the build environment 
+
+set -e
+
+[ -n "$SDEROOT" ] ||
+	export SDEROOT=$( cd "${0%/*}/.."; pwd -P )
+
+. $SDEROOT/lib/libsde.in
 
 nocheck=0
 downclean=0
@@ -36,8 +42,8 @@ while [ "$1" ] ; do
 	    -download)
 		downclean=1 ;;
 	    -*)
-		echo "Usage: $0 [ -build ] [ -cache ] [ -full ] [ -nocheck ] [ -download ]"
-		echo "       ${0//[a-zA-Z\/.]/ } [ dir(s) ]"
+	    	. $SDEROOT/lib/sde-help.in
+		help_command cleanup
 		exit 1 ;;
 	    *)
 		break ;;
diff --git a/lib/sde-cleanup.hlp b/lib/sde-cleanup.hlp
new file mode 100644
index 0000000..58b0f84
--- /dev/null
+++ b/lib/sde-cleanup.hlp
@@ -0,0 +1,17 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# Filename: lib/sde-cleanup.hlp
+# Copyright (C) 2007 The OpenSDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+
+		echo "Usage: $0 [ -build ] [ -cache ] [ -full ] [ -nocheck ] [ -download ]"
+		echo "       ${0//[a-zA-Z\/.]/ } [ dir(s) ]"