diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c15c7ffd1394..dc3261a6cb75 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-28  Stan Shebs  <shebs@apple.com>
+
+	* config/darwin.h (STANDARD_EXEC_PREFIX): Don't define.
+	(NEXT_OBJC_RUNTIME): Define.
+	
 Sat Apr 28 21:02:58 CEST 2001  Jan Hubicka  <jh@suse.cz>
 
 	* rtl.h (simplify_gen_relational): Add cmp_mode parameter.
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 269d78ce9836..fa9024106259 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -30,10 +30,10 @@ Boston, MA 02111-1307, USA.  */
 /* Although NeXT ran on many different architectures, as of Jan 2001
    the only supported Darwin targets are PowerPC and x86.  */
 
-/* Make the compiler look here for standard stuff.  */
-
-#undef STANDARD_EXEC_PREFIX
-#define STANDARD_EXEC_PREFIX "/usr/libexec/"
+/* Technically, STANDARD_EXEC_PREFIX should be /usr/libexec/, but in
+   practice this makes it hard to install new compilers elsewhere, so
+   leave it undefined and expect system builders to set configure args
+   correctly.  */
 
 /* Name of the command that invokes the compiler - used in g++.c.  */
 
@@ -70,6 +70,11 @@ Boston, MA 02111-1307, USA.  */
 #undef	WCHAR_TYPE_SIZE
 #define WCHAR_TYPE_SIZE 32
 
+/* Default to using the NeXT-style runtime, since that's what is
+   pre-installed on Darwin systems.  */
+
+#define NEXT_OBJC_RUNTIME
+
 /* Don't default to pcc-struct-return, because gcc is the only compiler, and
    we want to retain compatibility with older gcc versions.  */