diff --git a/src/ChangeLog b/src/ChangeLog
index 3f666a98f35..6c0bf66e08a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-28  Chong Yidong  <cyd@stupidchicken.com>
+
+	* m/mips.h: Remove DATA_START.  Suggested by Dan Nicolaescu.
+
+	* m/alpha.h: Don't define DATA_START on NetBSD (Bug#4629).
+
 2010-01-28  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xfns.c (Fx_create_frame): Remove window size matching code from
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 26cdb807452..5abf8bba726 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -95,7 +95,7 @@ NOTE-END
 
 #undef UNEXEC
 #define UNEXEC unexelf.o
-#ifndef GNU_LINUX
+#if !defined(GNU_LINUX) && !defined(__NetBSD__)
 #define DATA_START    0x140000000
 #endif
 
diff --git a/src/m/mips.h b/src/m/mips.h
index 2b47dba25fa..7a84b6596c8 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -50,10 +50,6 @@ NOTE-END  */
 
 #define TEXT_START      0x00400000
 
-#ifndef GNU_LINUX
-#define DATA_START      0x10000000
-#endif
-
 
 #if 0 /* These definitions were advantageous when not using
 	 USE_LSB_TAG.  With that, they get ignored but cause errors.  */