diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 83c8182544..be3122a951 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 25 23:16:58 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* gdb.threads/Makefile.in (docdir): Removed.
+
 Tue Jun 25 17:02:39 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
 
 	* configure.in (AC_PREREQ): autoconf 2.5 or higher.
diff --git a/gdb/testsuite/gdb.threads/Makefile.in b/gdb/testsuite/gdb.threads/Makefile.in
new file mode 100644
index 0000000000..678e2791c5
--- /dev/null
+++ b/gdb/testsuite/gdb.threads/Makefile.in
@@ -0,0 +1,156 @@
+# Makefile for the threads tests for GDB.
+# Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+
+# This file is part of GDB.
+
+# GDB is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GDB is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+srcdir = .
+prefix = /usr/local
+program_transform_name =
+
+exec_prefix = $(prefix)
+bindir = $(exec_prefix)/bin
+libdir = $(exec_prefix)/lib
+tooldir = $(libdir)/$(target_alias)
+
+datadir = $(exec_prefix)/lib/dejagnu
+mandir = $(prefix)/man
+man1dir = $(mandir)/man1
+man2dir = $(mandir)/man2
+man3dir = $(mandir)/man3
+man4dir = $(mandir)/man4
+man5dir = $(mandir)/man5
+man6dir = $(mandir)/man6
+man7dir = $(mandir)/man7
+man8dir = $(mandir)/man8
+man9dir = $(mandir)/man9
+infodir = $(prefix)/info
+includedir = $(prefix)/include
+gxx_includedir = $(tooldir)/g++-include
+targetdir = $(datadir)/$(target_alias)
+
+SHELL = /bin/sh
+
+INSTALL = install -c
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL)
+
+CFLAGS = -g
+
+RUNTESTFLAGS = 
+
+LINK=		ln -s
+
+EXPECT = ` \
+  if [ -f $${rootme}/../../../expect/expect ] ; then \
+    echo $${rootme}/../../../expect/expect ; \
+  else \
+    echo expect ; \
+  fi`
+
+RUNTEST = ` \
+  if [ -f $${rootme}/../../dejagnu/site.exp ] ; then \
+    echo $${rootme}/../../dejagnu/runtest ; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo runtest; \
+    else \
+      t='$(program_transform_name)'; echo runtest | sed -e '' $$t; \
+    fi; \
+  fi`
+
+CC = ` \
+  if [ -f $${rootme}/../../../gcc/xgcc ] ; then \
+    echo $${rootme}/../../../gcc/xgcc -B$${rootme}/../../../gcc/; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo gcc; \
+    else \
+      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
+    fi; \
+  fi`
+
+#### host, target, and site specific Makefile frags come in here.
+
+EXECUTABLES = $(STEP_EXECUTABLE)
+
+
+all:	$(EXECUTABLES)
+
+step.o: $(srcdir)/step.c
+	$(CC) -c $(CFLAGS) $(THREADFLAGS) $<
+
+step: step.o
+	$(CC) $(CFLAGS) $(THREADFLAGS) $(LDFLAGS) -o step step.o $(LIBS)
+
+# This gets compiled *without* -g, so don't add CFLAGS here.
+
+.NOEXPORT:
+
+INFODIRS=doc
+
+info:
+
+install-info:
+
+dvi:
+
+install:
+
+uninstall: force
+
+site.exp: ./config.status Makefile
+	@echo "Making a new config file..."
+	-@rm -f ./tmp?
+	@touch site.exp
+	-@mv site.exp site.bak
+	@echo "## these variables are automatically generated by make ##" > ./tmp0
+	@echo "# Do not edit here. If you wish to override these values" >> ./tmp0
+	@echo "# add them to the last section" >> ./tmp0
+	@echo "set host_triplet ${host_canonical}" >> ./tmp0
+	@echo "set target_triplet ${target_canonical}" >> ./tmp0
+	@echo "set srcdir ${srcdir}" >> ./tmp0
+		@echo "set objdir `pwd`" >> ./tmp0
+	@echo "set tool gdb" >> ./tmp0
+	@echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0
+		@cat ./tmp0 > site.exp
+	@cat site.bak | sed \
+			-e '1,/^## All variables above are.*##/ d' >> site.exp
+	-@rm -f ./tmp?
+
+installcheck:
+check: site.exp all just-check
+just-check:
+	rootme=`pwd`; export rootme; \
+	srcdir=${srcdir} ; export srcdir ; \
+	EXPECT=${EXPECT} ; export EXPECT ; \
+	if [ -f $${rootme}/../../expect/expect ] ; then  \
+	  TCL_LIBRARY=$${srcdir}/../../tcl/library ; \
+	  export TCL_LIBRARY ; fi ; \
+	$(RUNTEST) $(RUNTESTFLAGS) --tool gdb --srcdir $(srcdir)
+
+clean mostlyclean:
+	-rm -f *~ *.o a.out xgdb *.x $(EXECUTABLES)
+	-rm -f core core.coremaker coremaker.core corefile
+
+distclean maintainer-clean realclean: clean
+	-rm -f *~ core *.log *.plog *.sum *.psum site.*
+	-rm -f Makefile config.status *-init.exp
+	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
+
+Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in $(host_makefile_frag) $(target_makefile_frag)
+	$(SHELL) ./config.status
+