diff --git a/ChangeLog b/ChangeLog
index 71c4f3c..d07feea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-02  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* GNUmakefile: Drop library.make hack that was used to support
+	versions of gnustep-make older than October 2001.  If your
+	gnustep-make is that old, please upgrade.
+
 2006-02-24  Jeremy Bettis  <jeremy@deadbeef.com>
 
     * misc.c: Added some missing objc_DECLARE keywords on function pointer definitions.
diff --git a/GNUmakefile b/GNUmakefile
index 571302c..01993c7 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -32,18 +32,6 @@ CVS_TAG_NAME=objc
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
-# make sure we don't install in a library-combo dir 
-# (this is only for gnustep-make 1, newer gnustep-makes use
-# clibrary.make so these settings will be ignored)
-ifeq ($(GNUSTEP_FLATTENED),)
-  LIBRARY_INSTALL_DIR = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
-else
-  LIBRARY_INSTALL_DIR = $(GNUSTEP_LIBRARIES_ROOT)
-endif
-
-# for gnustep-make 1
-LIBRARY_NAME = libobjc
-# for gnustep-make > 1 
 CLIBRARY_NAME = libobjc
 
 # dce, decosf1, irix, mach, os2, posix, pthreads, single, solaris, vxworks
@@ -159,21 +147,7 @@ endif
 
 -include GNUmakefile.preamble
 
-# Use library.make for gnustep-make version 1.0.x
-# Use clibrary.make for all other gnustep-make versions
-USE_LIBRARY_MAKE=no
-
-ifeq ($(GNUSTEP_MAKE_MAJOR_VERSION),1)
- ifeq ($(GNUSTEP_MAKE_MINOR_VERSION),0)
-  USE_LIBRARY_MAKE=yes
- endif
-endif
-
-ifeq ($(USE_LIBRARY_MAKE),yes)
-  include $(GNUSTEP_MAKEFILES)/library.make
-else
-  include $(GNUSTEP_MAKEFILES)/clibrary.make
-endif
+include $(GNUSTEP_MAKEFILES)/clibrary.make
 
 -include GNUmakefile.postamble