diff --git a/ChangeLog b/ChangeLog
index edd130c30..2fb83e9c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-16  David Ayers  <d.ayers@inode.at>
+
+	* config.make.in: Default to builing -baseadd on non *-gnu-*
+	configurations.
+
 2003-07-15  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/gnustep/base/NSArray.h: Add methods for creating from URL
diff --git a/config.mak.in b/config.mak.in
index 2ac606805..7747800b4 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -19,3 +19,9 @@ ifeq ($(shared),yes)
   CONFIG_SYSTEM_LIBS += @LIBS@
 endif
 
+# Default to building only -baseadd
+# on non *-gnu-* library combos
+ifneq ($(FOUNDATION_LIB),gnu)
+add=yes
+base=no
+endif