diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d465072d8d..5372b43a36 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,20 @@
+Mon Aug 29 12:04:07 1994  Stu Grossman  (grossman@cygnus.com)
+
+	* nlm/configure.in:  Stop using cpu.c.  Put it in TDEPFILES instead.
+	* config/alpha/gdbserve.mt (TDEPFILES):  Remove alpha-patch.o.
+
+	* nlm/Makefile.in:  Add rule for .S.o.
+	* nlm/aio.h:  Protect from multiple inclusions.
+	* nlm/alpha-io.S:  Remove everything we don't need.
+	* nlm/{alpha-patch.c, alpha-patch.h, alpha-uart.c, alpha-uart.h}:
+	Remove, no longer needed.
+	* nlm/alpha.c:  Merge in lots of stuff from previous files.
+	* nlm/alpha.h:  Don't #include alpha-patch.h.  Make
+	breakpoint_insn extern.
+	* Move stuff from alpha-patch.h into here.
+
+	* config/alpha/gdbserve.mt (TDEPFILES):  Get rid of alpha-uart.o.
+
 Mon Aug 29 11:34:34 1994  Jim Kingdon  (kingdon@cygnus.com)
 
 	* annotate.c (annotate_starting): Flush output.
diff --git a/gdb/config/alpha/gdbserve.mt b/gdb/config/alpha/gdbserve.mt
index 295e8ad21b..71a8604320 100644
--- a/gdb/config/alpha/gdbserve.mt
+++ b/gdb/config/alpha/gdbserve.mt
@@ -1,3 +1,3 @@
 # Target: GDBSERVE.NLM running on a little-endian Alpha
-TDEPFILES= alpha.o alpha-io.o alpha-patch.o
+TDEPFILES= alpha.o alpha-io.o
 CPU_FILE= alpha
diff --git a/gdb/nlm/configure.in b/gdb/nlm/configure.in
index 6eb6f9d205..69d10c0b92 100644
--- a/gdb/nlm/configure.in
+++ b/gdb/nlm/configure.in
@@ -267,8 +267,8 @@ target_makefile_frag=../config/${gdb_target_cpu}/gdbserve.mt
 
 files=
 links=
-rm -f cpu.c
+rm -f cpu.h
 if [ "${cpufile}" != "" ]; then
-	files="${files} ${cpufile}.c ${cpufile}.h"
-	links="${links} cpu.c cpu.h"
+	files="${files} ${cpufile}.h"
+	links="${links} cpu.h"
 fi