diff --git a/ChangeLog b/ChangeLog
index 39d76922..fe6c853d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jan 18 12:15:11 2001  Nicola Pero  <nicola@brainstorm.co.uk>
+
+	* rpm.make: Build the file-list only at top level.
+	* gnustep-make.spec.in: Do a make distclean before running
+	configure.
+	
 2001-01-17  Adam Fedor  <fedor@gnu.org>
 
 	* library.make: Revert last change, add LIBRARY_INSTALL_DIR
diff --git a/gnustep-make.spec.in b/gnustep-make.spec.in
index f611054f..13da2035 100644
--- a/gnustep-make.spec.in
+++ b/gnustep-make.spec.in
@@ -46,6 +46,7 @@ for library combo %{gs_libcombo}.
 %setup -n %{gs_name}-%{gs_version}
 
 %build
+make distclean
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{gs_prefix} --with-library-combo=%{gs_libcombo}
 make
 
diff --git a/rpm.make b/rpm.make
index 3eafe800..d16fc507 100644
--- a/rpm.make
+++ b/rpm.make
@@ -201,6 +201,9 @@ RPM_MAKE_LOADED=yes
 
 ifeq ($(filelist),yes)
 
+  # Build the file-list only at top level
+  ifeq ($(MAKELEVEL),0)
+
   # Determine which file list to build
   ifeq ($(debug),yes)
     FILE_LIST = $(shell pwd)/file-list-debug
@@ -231,6 +234,8 @@ ifeq ($(filelist),yes)
 	sed -e "s|$(INSTALL_ROOT_DIR)||" $(FILE_LIST) > file-list.tmp
 	mv file-list.tmp $(FILE_LIST)                             
 
+  endif # MAKELEVEL
+
 endif # filelist == yes