diff --git a/psConfig/tasks/gpsr/gpsr.conf b/psConfig/tasks/gpsr/gpsr.conf
index f148a72f9dd0fd356e0c33a08ae2d032d65a0726..3935a74d5901956a079e0f818410f00be234f23f 100644
--- a/psConfig/tasks/gpsr/gpsr.conf
+++ b/psConfig/tasks/gpsr/gpsr.conf
@@ -33,7 +33,7 @@ autoload=yes;
 [pocketsphinxinstance]
 name=stop;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/tasks/gpsr/stop.jsgf;
+jsgf=../../../psGrammar/confirm/stop.jsgf;
 rsbscope=/speechrec/psa/stop;
 bestpath=no;
 autoload=yes;
diff --git a/psGrammar/confirm/stop.jsgf b/psGrammar/confirm/stop.jsgf
new file mode 100644
index 0000000000000000000000000000000000000000..56983ffa7c89c1e3db9b2a1e064350cae2637047
--- /dev/null
+++ b/psGrammar/confirm/stop.jsgf
@@ -0,0 +1,8 @@
+#JSGF V1.0;
+grammar Stop_commands;
+
+public <statement> = [<robot>] [please] <stop> [please] [<robot>];
+
+<robot> = (tobi | robot | biron | pepper);
+
+<stop> = (((stop [following [me]]) | wait) [here]);