diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 634e9ac1b6..9e6ee238c0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+Thu Oct 26 22:02:27 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in: Add support for PowerMac host, add beginnings
+	of native support.
+	* mpw-make.sed: Disable subdir recursion, edit out useless rule.
+	* mac-xdep.c (Values.h): Don't include.
+	(GestaltEqu.h): Include Gestalt.h instead.
+	(do_mouse_down): Comment out control tracking, needs to be
+	updated to use UPP before will work on PowerMac.
+
 Thu Oct 26 15:21:32 1995  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
 	* regex.h: Renamed to gnu-regex.h.
@@ -20,12 +30,14 @@ Tue Oct 24 18:30:18 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
 Tue Oct 24 12:26:14 1995  Stu Grossman  (grossman@cygnus.com)
 
-	* monitor.c (monitor_expect_regexp):  Same as monitor_expect, but
-	with the obvious extension.  (monitor_read_memory_single):  Use
-	regexp for getmem.resp_delim because of parsing ambiguities caused
-	by certain monitors.  (monitor_read_memory):  Use new regexp stuff
-	to parse getmem.resp_delim.
-	* monitor.h (struct memrw_cmd->resp_delim):  Document this as a regexp.
+	* monitor.c (monitor_expect_regexp): Same as monitor_expect, but
+ 	with the obvious extension.
+	(monitor_read_memory_single): Use regexp for getmem.resp_delim
+ 	because of parsing ambiguities caused by certain monitors.
+	(monitor_read_memory): Use new regexp stuff to parse
+ 	getmem.resp_delim.
+	* monitor.h (struct memrw_cmd->resp_delim): Document this as a
+ 	regexp.
 	* sh3-rom.c:  Finish off table.  Use new regexp capability for
 	getmem commands.
 
diff --git a/gdb/mac-xdep.c b/gdb/mac-xdep.c
index f21757402e..20a79a53c8 100644
--- a/gdb/mac-xdep.c
+++ b/gdb/mac-xdep.c
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "readline.h"
 #include "history.h"
 
-#include <Values.h>
 #include <Types.h>
 #include <Resources.h>
 #include <QuickDraw.h>
@@ -45,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <Packages.h>
 #include <Traps.h>
 #include <Lists.h>
-#include <GestaltEqu.h>
+#include <Gestalt.h>
 #include <PPCToolbox.h>
 #include <AppleEvents.h>
 #include <StandardFile.h>
@@ -542,7 +541,13 @@ do_mouse_down (WindowPtr win, EventRecord *event)
 		}
 	      break;
 	    default:
+#if 0 /* don't deal with right now */
+#if 1 /* universal headers */
+	      value = TrackControl (control, mouse, (ControlActionUPP) v_scroll_proc);
+#else
 	      value = TrackControl (control, mouse, (ProcPtr) v_scroll_proc);
+#endif
+#endif
 	      break;
 	    }
 	}
diff --git a/gdb/mpw-config.in b/gdb/mpw-config.in
index 6c51e8bfcc..3711f50e79 100644
--- a/gdb/mpw-config.in
+++ b/gdb/mpw-config.in
@@ -1,10 +1,14 @@
 # Configuration fragment for GDB.
 
-forward-include "{srcdir}"config:m68k:xm-mpw.h xm.h
+If "{host_canonical}" =~ /m68k-apple-mpw/
+	forward-include "{srcdir}"config:m68k:xm-mpw.h xm.h
 
-forward-include "{srcdir}"config:m68k:xm-m68k.h 'm68k/xm-m68k.h'
+Else If "{host_canonical}" =~ /powerpc-apple-mpw/
+	forward-include "{srcdir}"config:powerpc:xm-mpw.h xm.h
 
-Set xdepfiles   '"{o}"mac-xdep.c.o'
+End If
+
+Set xdepfiles '"{o}"mac-xdep.c.o'
 
 # Make a copy of this file and give it a different name, so it
 # won't be confused with GDB's serial.h.
@@ -36,17 +40,27 @@ Else If "{target_canonical}" =~ /mips-idt-ecoff/
 Else If "{target_canonical}" =~ /sh-hitachi-hms/
 	forward-include "{srcdir}"config:sh:tm-sh.h tm.h
 	Set tdepfiles '"{o}"sh-tdep.c.o'
+
 End If
 
-If "{target_canonical}" != "{host_canonical}"
+If "{target_canonical}" =~ /m68k-apple-macos/
+	forward-include "{srcdir}"config:m68k:nm-macos.h nm.h
+	Set natdepfiles '"{o}"mac-nat.c'
+
+Else If "{target_canonical}" =~ /powerpc-apple-macos/
+	forward-include "{srcdir}"config:powerpc:nm-macos.h nm.h
+	Set natdepfiles '"{o}"mac-nat.c'
+
+Else
 	forward-include "{srcdir}"config:nm-empty.h nm.h
-	Set natdepfiles " "
+	Set natdepfiles ' '
+
 End If
 
 Echo '# From mpw-config.in'				 > "{o}"mk.tmp
 Echo "TDEPFILES = " {tdepfiles}				>> "{o}"mk.tmp
 Echo "XDEPFILES = " {xdepfiles}				>> "{o}"mk.tmp
-Echo "NATDEPFILES = " {nat_file}			>> "{o}"mk.tmp
+Echo "NATDEPFILES = " {natdepfiles}			>> "{o}"mk.tmp
 Echo "XM_ADD_FILES = "					>> "{o}"mk.tmp
 Echo "TM_ADD_FILES = "					>> "{o}"mk.tmp
 Echo "NAT_ADD_FILES = "					>> "{o}"mk.tmp
diff --git a/gdb/mpw-make.sed b/gdb/mpw-make.sed
index 6725b3cd7a..0603bd6aaf 100644
--- a/gdb/mpw-make.sed
+++ b/gdb/mpw-make.sed
@@ -130,3 +130,7 @@ readline_headers =\
 	{MAKEPEF} gdb{PROG_EXT} -o gdb {MAKEPEF_TOOL_FLAGS} {MAKEPEF_FLAGS}\
 	{REZ} "{s}"mac-gdb.r -o gdb -append -d PROG_NAME='"'gdb'"' -d VERSION_STRING='"'{version}'"'\
 
+# Don't do any recursive subdir stuff.
+/ subdir_do/s/{MAKE}/null-command/
+
+/^config.status \\Option-f/,/^$/d