diff --git a/Tools/jmavsim_run.sh b/Tools/jmavsim_run.sh
new file mode 100755
index 0000000000..4c853b0953
--- /dev/null
+++ b/Tools/jmavsim_run.sh
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$SCRIPT_DIR/jMAVSim"
+
+ant create_run_jar copy_res
+cd out/production
+java -Djava.ext.dirs= -jar jmavsim_run.jar -udp 127.0.0.1:14560
diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh
index e887db4375..dc0123edde 100755
--- a/Tools/sitl_run.sh
+++ b/Tools/sitl_run.sh
@@ -64,10 +64,7 @@ SIM_PID=0
 
 if [ "$program" == "jmavsim" ] && [ ! -n "$no_sim" ]
 then
-	cd $src_path/Tools/jMAVSim
-	ant create_run_jar copy_res
-	cd out/production
-	java -Djava.ext.dirs= -jar jmavsim_run.jar -udp 127.0.0.1:14560 &
+	./Tools/jmavsim_run.sh &
 	SIM_PID=`echo $!`
 	cd ../..
 elif [ "$program" == "gazebo" ] && [ ! -n "$no_sim" ]
@@ -135,6 +132,7 @@ fi
 
 if [ "$program" == "jmavsim" ]
 then
+	pkill -9 -P $SIM_PID
 	kill -9 $SIM_PID
 elif [ "$program" == "gazebo" ]
 then