diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 536ddcf713..7e0285d86a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+Sun Feb  6 06:55:15 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config/mips/mipsm3.mh, config/i386/i386m3.mh,
+	config/ns32k/ns32km3.mh: Define NAT_FILE.
+	* config/nm-m3.h: Change guard from _OS_MACH3_H_ and _OS_MACH3_H
+	(it was inconsistent and namespace-wrong) to NM_M3_H.
+	* m3-nat.c (mach_really_wait): Change parameter name to ourstatus.
+	(m3_open): New function.
+	(m3_ops): Use it.
+	* TODO: Update Mach section.
+
+	* Makefile.in: Remove "rapp" stuff; it is superseded by gdbserver.
+
 Sun Feb  6 13:26:21 1994  Per Bothner  (bothner@kalessin.cygnus.com)
 
 	* printcmd.c (printf_command):  Add missing single-letter
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 193557ba59..a6402c8684 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -446,8 +446,6 @@ OBS =	version.o main.o blockframe.o breakpoint.o findvar.o stack.o thread.o \
 	c-valprint.o cp-valprint.o ch-valprint.o m2-valprint.o nlmread.o \
 	serial.o mdebugread.o
 
-RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
-
 TSOBS = inflow.o
 
 NTSOBS = standalone.o
@@ -574,14 +572,6 @@ gdb1: gdb
 	rm -f gdb1
 	cp gdb gdb1
 
-# This is a remote stub which runs under unix and starts up an
-# inferior process.  This is at least useful for debugging GDB's
-# remote support.
-rapp: $(RAPP_OBS)
-	rm -f rapp_init.c
-	$(srcdir)/munch $(MUNCH_DEFINE) $(RAPP_OBS) > rapp_init.c
-	$(CC-LD) $(INTERNAL_LDFLAGS) -o $@ rapp_init.c $(RAPP_OBS)
-
 config.status:
 	@echo "You must configure gdb.  Look at the README file for details."
 	@false
diff --git a/gdb/TODO b/gdb/TODO
index 0e95297c07..7230f5f8bc 100644
--- a/gdb/TODO
+++ b/gdb/TODO
@@ -10,9 +10,8 @@ bug-gdb@prep.ai.mit.edu.
 Things to do for Mach
 ---------------------
 
-This section is up to date as of 28 Oct 1993.
-
-All my attempted compilation was on douglas.gnu.ai.mit.edu.  
+Note: If mach_port_t is undefined, you have mach2 headers instead of
+mach3 headers.  Get the mach3 headers or typedef it to unsigned int.
 
 0.  Get it to compile and run again, especially for non-threaded
 programs (some of the following are sub-tasks for this).
@@ -45,15 +44,9 @@ Believed to be fixed (fix not yet tested).
 
 6.  i386_mach3_float_info and register_addr were undefined in the
 link.  I haven't investigated, but probably just another easy
-configuration thing or something.
+configuration thing or something. (possibly already fixed).
 
-7.  I couldn't find mach_port_t in any of the headers in
-/usr/include/*.h or /usr/include/mach/*.h (I think those are the two
-places I grepped; I don't know what headers I was actually getting).
-Typedeffing it to void * in nm-m3.h seemed to work, but of course
-that's hardly an elegant solution.
-
-8.  Implement the features which CMU gdb has which the main GDB does
+7.  Implement the features which CMU gdb has which the main GDB does
 not.  This could be done by getting paperwork from CMU and merging
 their changes, or by reimplementing them.
 
diff --git a/gdb/config/i386/i386m3.mh b/gdb/config/i386/i386m3.mh
index 746bf7847c..3d29b7fd5e 100644
--- a/gdb/config/i386/i386m3.mh
+++ b/gdb/config/i386/i386m3.mh
@@ -3,6 +3,7 @@
 XDEPFILES= i387-tdep.o coredep.o
 NATDEPFILES= i386m3-nat.o m3-nat.o 
 XM_FILE= xm-i386m3.h
+NAT_FILE= nm-m3.h
 
 # Don't use the mmalloc library in Mach 3.
 MMALLOC = 
diff --git a/gdb/config/mips/mipsm3.mh b/gdb/config/mips/mipsm3.mh
index 5b40b4b90e..08c8392f17 100644
--- a/gdb/config/mips/mipsm3.mh
+++ b/gdb/config/mips/mipsm3.mh
@@ -4,6 +4,7 @@
 XDEPFILES= coredep.o
 NATDEPFILES= mipsm3-nat.o m3-nat.o
 XM_FILE= xm-mipsm3.h
+NAT_FILE= nm-m3.h
 
 # Don't use the mmalloc library in Mach 3.
 MMALLOC = 
diff --git a/gdb/config/nm-m3.h b/gdb/config/nm-m3.h
index 07bf625d8a..41e595b012 100644
--- a/gdb/config/nm-m3.h
+++ b/gdb/config/nm-m3.h
@@ -18,8 +18,8 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#ifndef _OS_MACH3_H_
-#define _OS_MACH3_H
+#ifndef NM_M3_H
+#define NM_M3_H
 
 #include <mach.h>
 
@@ -114,4 +114,4 @@ struct emul_stack_top {
 /* If in mach_msg() and ^C is typed set immediate_quit */
 #define REQUEST_QUIT() mach3_request_quit ()
 
-#endif /* _OS_MACH3_H_ */
+#endif /* NM_M3_H */
diff --git a/gdb/config/ns32k/ns32km3.mh b/gdb/config/ns32k/ns32km3.mh
index 169aea4238..3d0e657eaa 100644
--- a/gdb/config/ns32k/ns32km3.mh
+++ b/gdb/config/ns32k/ns32km3.mh
@@ -2,6 +2,7 @@
 
 NATDEPFILES= m3-nat.o ns32km3-nat.o
 XM_FILE= xm-ns32km3.h
+NAT_FILE= nm-m3.h
 
 # Don't use the mmalloc library in Mach 3.
 MMALLOC = 
diff --git a/gdb/m3-nat.c b/gdb/m3-nat.c
index 90cddb0c85..e3f41d320e 100644
--- a/gdb/m3-nat.c
+++ b/gdb/m3-nat.c
@@ -1211,7 +1211,7 @@ int mach_really_waiting;
    Returns the inferior_pid for rest of gdb.
    Side effects: Set *OURSTATUS.  */
 int
-mach_really_wait (w)
+mach_really_wait (ourstatus)
      struct target_waitstatus *ourstatus;
 {
   int pid;
@@ -4225,6 +4225,14 @@ m3_detach (args, from_tty)
 }
 #endif /* ATTACH_DETACH */
 
+static void
+m3_open (arg, from_tty)
+     char *arg;
+     int from_tty;
+{
+  error ("Use the \"run\" command to start a Unix child process.");
+}
+
 #ifdef DUMP_SYSCALL
 #ifdef __STDC__
 #define STR(x) #x
@@ -4445,7 +4453,7 @@ struct target_ops m3_ops = {
   "mach",			/* to_shortname */
   "Mach child process",	/* to_longname */
   "Mach child process (started by the \"run\" command).",	/* to_doc */
-  ??_open,			/* to_open */
+  m3_open,			/* to_open */
   0,				/* to_close */
   m3_attach,			/* to_attach */
   m3_detach, 		/* to_detach */