diff --git a/Makefile.am b/Makefile.am
index 4181ffa0f5..50977a2241 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,9 @@ doxydoc:
 lfundoc:
 	development/tools/gen_lfuns.py src/LyXAction.cpp > lib/doc/LFUNs.lyx
 
+keystest:
+	development/keystest/lyx_make.sh
+
 lgbtags:
 	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
diff --git a/development/keystest/lyx_make.sh b/development/keystest/lyx_make.sh
index ed0c397b1f..b9e5d590f2 100755
--- a/development/keystest/lyx_make.sh
+++ b/development/keystest/lyx_make.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-#This script updates LyX, runs LyX, starts spamming it with hundreds of 
+#development/keystest/lyx_make.sh [--update]
+#This script runs LyX (and possibly updates), starts spamming it with hundreds of 
 #keypresses, and logs all output, including backtraces to development/keystest/out/GDB .
 #Use report.sh to generated the more useful bug reports in development/keystest/out/{or}*
 
@@ -12,8 +13,17 @@ fi
 mkdir -p $LT/out
 if which wmctrl xvkbd bash xterm python
 then 
- svn up
- ./autogen.sh && ./configure --enable-debug -- && nice -18 make && (bash $LT/autolyx & sleep 9 ; xterm -e python $LT/test.py)
+
+ if [ a"$1" == a--update ]; then
+  svn up
+  ./autogen.sh && ./configure --enable-debug -- && nice -18 make && (bash $LT/autolyx & sleep 9 ; xterm -e python $LT/test.py)
+ else
+  DBG=`src/lyx --version 2>&1 | grep C++.Compiler.flags|grep -- -g`;
+  if [ -z "$DBG" ]; then echo Wrong build of LyX binary. ; exit; fi
+
+  bash $LT/autolyx & sleep 9 ; xterm -e python $LT/test.py
+ fi
+
 else
  echo NEEDS the following packages: 
  echo wmctrl xvkbd bash xterm python