diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d3265c76f4..c8b47d4a4e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 08 17:05:30 1993  Jeffrey Wheat  (cassidy@cygnus.com)
+
+	* Makefile.in: Change RUNTEST_FLAGS back to RUNTESTFLAGS
+		       Change RUNTEST = runtest to test for existance of
+			a runtest in the source tree first.
+
 Mon Nov  8 10:42:03 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* Makefile.in: Remove unused variable GCC.  Remove "#CC=cc" line
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index eb955429e1..79fd96eeee 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -189,7 +189,10 @@ DIST=gdb
 LINT=/usr/5bin/lint
 LINTFLAGS= $(BFD_CFLAGS)
 
-RUNTEST=runtest
+RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
+		echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \
+	   fi`
+
 RUNTESTFLAGS=
 
 # This is ser-unix.o for any system which supports a v7/BSD/SYSV/POSIX