diff --git a/ChangeLog b/ChangeLog
index 0c71325dc..74f7041ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 17 16:46:09 2001  Nicola Pero  <nicola@brainstorm.co.uk>
+
+	* GNUmakefile: Added PACKAGE_NEEDS_CONFIGURE and
+	RPM_DISABLE_RELOCATABLE.
+	* GNUmakefile: Simplified name to gnustep-base.
+	* gnustep-base.spec.in: New file.
+	* gnustep-base-debug.spec.in: Idem.
+	* gnustep-base.spec: Move to gnustep-base.spec.old.
+
 2001-01-13  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSMime.m: ([-decodeData:fromrange:intoData:withContext:])
diff --git a/GNUmakefile b/GNUmakefile
index 6f9124684..aeb984287 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -25,13 +25,16 @@
 # Install into the system root by default
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
+RPM_DISABLE_RELOCATABLE=YES
+PACKAGE_NEEDS_CONFIGURE = YES
+
 GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
 include ./Version
 
-PACKAGE_NAME = gstep-base
+PACKAGE_NAME = gnustep-base
 
 #
 # The list of subproject directories
diff --git a/gnustep-base-debug.spec.in b/gnustep-base-debug.spec.in
new file mode 100644
index 000000000..344a1b9eb
--- /dev/null
+++ b/gnustep-base-debug.spec.in
@@ -0,0 +1,14 @@
+Release: 	1
+Source: 	ftp://ftp.gnustep.org/pub/gnustep/core/%{gs_name}-%{gs_version}.tar.gz
+Copyright: 	GPL
+Group: 		Development/Tools
+Summary: 	GNUstep Base library package - debugging version
+Packager:	Adam Fedor <fedor@gnu.org>
+Vendor:		The GNUstep Project
+URL:		http://www.gnustep.org/
+Requires:	gnustep-make = 0.9.0
+
+%description 
+This package contains the debuggable version of the GNUstep Base
+Library.  You probably only need it if you want to compile debuggable
+GNUstep programs.
diff --git a/gnustep-base.spec.in b/gnustep-base.spec.in
new file mode 100644
index 000000000..fff9f0acd
--- /dev/null
+++ b/gnustep-base.spec.in
@@ -0,0 +1,18 @@
+Release: 	1
+Source: 	ftp://ftp.gnustep.org/pub/gnustep/core/%{gs_name}-%{gs_version}.tar.gz
+Copyright: 	GPL
+Group: 		Development/Tools
+Summary: 	GNUstep Base library package
+Packager:	Adam Fedor <fedor@gnu.org>
+Vendor:		The GNUstep Project
+URL:		http://www.gnustep.org/
+Requires:	gnustep-make = 0.9.0
+
+%description
+The GNUstep Base Library is a library of general-purpose, non-graphical
+Objective C objects.  For example, it includes classes for strings,
+object collections, byte streams, typed coders, invocations,
+notifications, notification dispatchers, moments in time, network ports,
+remote object messaging support (distributed objects), event loops, and
+random number generators.  This package includes development headers.
+#Library combo is %{libcombo}.
diff --git a/gnustep-base.spec b/gnustep-base.spec.old
similarity index 100%
rename from gnustep-base.spec
rename to gnustep-base.spec.old