diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cfd13f7f269..d528a79dd62 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  6 20:02:33 1999  Fred Fish  <fnf@be.com>
+
+	* rs6000/xm-beos.h (HAVE_VPRINTF): Don't redefine if already defined.
+	(HAVE_PUTENV, HAVE_ATEXIT, HAVE_RENAME): Likewise.
+
 Wed May  5 20:28:32 1999  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* install.texi (Header Dirs): s/GPLUS/GPLUSPLUS/.
diff --git a/gcc/config/rs6000/xm-beos.h b/gcc/config/rs6000/xm-beos.h
index 681aa73bcc6..617ad2f5b45 100644
--- a/gcc/config/rs6000/xm-beos.h
+++ b/gcc/config/rs6000/xm-beos.h
@@ -72,10 +72,18 @@ extern void *alloca ();
 
 /* Define various things that the BeOS host has. */
 
+#ifndef HAVE_VPRINTF
 #define HAVE_VPRINTF
+#endif
+#ifndef HAVE_PUTENV
 #define HAVE_PUTENV
+#endif
+#ifndef HAVE_ATEXIT
 #define HAVE_ATEXIT
+#endif
+#ifndef HAVE_RENAME
 #define HAVE_RENAME
+#endif
 
 #define STDC_HEADERS 1