diff --git a/Tools/jMAVSim b/Tools/jMAVSim
index cb2d13087a..26bf9e6c74 160000
--- a/Tools/jMAVSim
+++ b/Tools/jMAVSim
@@ -1 +1 @@
-Subproject commit cb2d13087a671d80a68e65109ff4da307022dea0
+Subproject commit 26bf9e6c7416777850f3b40082d51c1fdf12ca1c
diff --git a/Tools/jmavsim_run.sh b/Tools/jmavsim_run.sh
index 3e37b8e71a..74da22e8ac 100755
--- a/Tools/jmavsim_run.sh
+++ b/Tools/jmavsim_run.sh
@@ -10,7 +10,7 @@ extra_args=
 baudrate=921600
 device=
 ip="127.0.0.1"
-while getopts ":b:d:p:qr:i:" opt; do
+while getopts ":b:d:p:qr:f:i:" opt; do
 	case $opt in
 		b)
 			baudrate=$OPTARG
@@ -30,6 +30,9 @@ while getopts ":b:d:p:qr:i:" opt; do
 		r)
 			extra_args="$extra_args -r $OPTARG"
 			;;
+		f)
+			extra_args="$extra_args -f $OPTARG"
+			;;
 		\?)
 			echo "Invalid option: -$OPTARG" >&2
 			exit 1
diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh
index 885213b8cd..22f9b57349 100755
--- a/Tools/sitl_run.sh
+++ b/Tools/sitl_run.sh
@@ -69,7 +69,7 @@ SIM_PID=0
 if [ "$program" == "jmavsim" ] && [ ! -n "$no_sim" ]
 then
 	# Start Java simulator
-	"$src_path"/Tools/jmavsim_run.sh -r 500 &
+	"$src_path"/Tools/jmavsim_run.sh -r 500 -f 1 &
 	SIM_PID=`echo $!`
 elif [ "$program" == "gazebo" ] && [ ! -n "$no_sim" ]
 then