diff --git a/ChangeLog b/ChangeLog
index 3bf74260b..174dc4070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-25  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GNUmakefile: Move xml and mime classes into an additional
+	library, and make base library depend on it.  EXPERIMENTAL.
+
 2002-02-25  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSObject.m: Rewrote key-value coding key manipulation to use
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index c233772e7..2e906ebcd 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -38,7 +38,7 @@ PACKAGE_NAME = gnustep-base
 LIBRARY_VAR = GNUSTEP_BASE
 
 # The library to be compiled
-LIBRARY_NAME=libgnustep-base
+LIBRARY_NAME=libgnustep-baseadd libgnustep-base
 
 ifeq ($(HAVE_OPENSSL), yes)
 
@@ -151,11 +151,9 @@ GSCountedSet.m \
 GSDictionary.m \
 GSFormat.m \
 GSHTTPURLHandle.m \
-GSMime.m \
 GSSet.m \
 GSString.m \
 GSValue.m \
-GSXML.m \
 NSAttributedString.m \
 NSArchiver.m \
 NSArray.m \
@@ -296,6 +294,7 @@ NSGeometry.h \
 NSHashTable.h \
 NSHost.h \
 NSInvocation.h \
+NSKeyValueCoding.h \
 NSLock.h \
 NSMapTable.h \
 NSMethodSignature.h \
@@ -332,7 +331,6 @@ FOUNDATION_HEADERS = \
 Foundation.h \
 NSByteOrder.h \
 NSConcreteNumber.h \
-NSKeyValueCoding.h \
 NSPathUtilities.h \
 NSSerialization.h \
 NSUtilities.h \
@@ -366,6 +364,8 @@ libgnustep-base_C_FILES = $(GNU_CFILES)
 libgnustep-base_OBJC_FILES = $(GNU_MFILES) \
 	$(BASE_MFILES) $(NSVALUE_MFILES) $(NSNUMBER_MFILES)
 
+libgnustep-baseadd_OBJC_FILES = GSMime.m GSXML.m
+
 # Extra DLL exports file
 libgnustep-base_DLL_DEF = libgnustep-base.def
 
diff --git a/Source/Makefile.preamble b/Source/Makefile.preamble
index 24c7e38f6..3bebc717f 100644
--- a/Source/Makefile.preamble
+++ b/Source/Makefile.preamble
@@ -55,7 +55,7 @@ ADDITIONAL_INCLUDE_DIRS = -I../Headers/gnustep -I../Headers \
 ADDITIONAL_LDFLAGS = 
 
 # Additional library directories the linker should search
-ADDITIONAL_LIB_DIRS = 
+ADDITIONAL_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
 
 ifeq ($(GNUSTEP_TARGET_OS),mingw32)
 libgnustep-base_LIBRARIES_DEPEND_UPON += -lobjc
@@ -67,9 +67,8 @@ ifeq ($(findstring darwin1, $(GNUSTEP_TARGET_OS)), darwin1)
 libgnustep-base_LIBRARIES_DEPEND_UPON += $(CONFIG_SYSTEM_LIBS) \
 	-flat_namespace
 endif
+libgnustep-base_LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
 
-
-#
 # Flags dealing with installing and uninstalling
 #