diff --git a/datamover/dist/datamover.sh b/datamover/dist/datamover.sh
deleted file mode 100755
index 19c9c2e084d5f1c4b661f8451a2f5fa88680e6fb..0000000000000000000000000000000000000000
--- a/datamover/dist/datamover.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-java -jar lib/datamover.jar "$@"
diff --git a/datamover/dist/datamover.start b/datamover/dist/datamover.start
new file mode 100755
index 0000000000000000000000000000000000000000..9d65f3845eda4fdd7fd50e9d5c9144cd4d71941a
--- /dev/null
+++ b/datamover/dist/datamover.start
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+if [ -f datamover.pid ]; then
+	PID=`cat datamover.pid`
+	if [ "$PID" != "" ]; then
+		if [ `ps -ef |grep $PID |grep -v grep|wc -l` = 1 ] ; then
+			kill $PID
+			echo "Already running - killing PID $PID and restarting"
+		fi
+	fi
+	rm datamover.pid
+fi
+
+if [ "$JAVA_HOME" != "" ]; then
+	JAVA_HOME="$JAVA_HOME/bin/"
+fi
+
+${JAVA_HOME}java -jar lib/datamover.jar "$@" & echo $! > datamover.pid
diff --git a/datamover/dist/datamover.stop b/datamover/dist/datamover.stop
new file mode 100755
index 0000000000000000000000000000000000000000..5f8acb10f1b55ea10507e2a20cf86d9879adb609
--- /dev/null
+++ b/datamover/dist/datamover.stop
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+if [ -f datamover.pid ]; then
+	PID=`cat datamover.pid`
+	if [ `ps -ef |grep $PID |grep -v grep|wc -l` = 0 ] ; then
+		echo "Program (PID $PID) does not seem to run."
+		rm datamover.pid
+		exit 1
+	fi
+	kill `cat datamover.pid`
+	rm datamover.pid
+	echo "Killed PID $PID..."
+else
+	echo "No datamover.pid found."
+fi