diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3407bf91d2c..dd608eddce8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-21  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* Makefile.am (all_property_files): Remove left over.
+	(classes.stamp): Add stamp for the ONESTEP build, also known as
+	--enable-libgcj-multifile.
+	* Makefile.in: Regenerated.
+
 2005-02-21  Michael Koch  <konqueror@gmx.de>
 
 	* java/awt/Button.java,
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index bd8c4d1acc7..3eeaa74fd34 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -500,7 +500,7 @@ all_java_source_files = \
 
 all_java_class_files = $(all_java_source_files:.java=.class)
 
-all_property_files = $(property_files) $(jgss_property_files) \
+all_property_files = $(property_files) \
     java/util/logging/logging.properties
 
 ## Build property files into the library.
@@ -522,7 +522,7 @@ classes.stamp: $(all_java_source_files)
 	@echo Compiling Java sourcefiles...
 	@: $(call write_entries_to_file,$?,libgcj.sourcelist)
 	$(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) @libgcj.sourcelist
-
+	echo > classes.stamp
 # This next rule seems backward, but reflects the fact that 1) all
 # classfiles are compiled in one go when classes.stamp is built and 2)
 # anything which depends on a particular .class file must wait until
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 38d21a7642b..91944ce8b12 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -5344,7 +5344,7 @@ all_java_source_files = \
     $(gnu_xml_source_files)
 
 all_java_class_files = $(all_java_source_files:.java=.class)
-all_property_files = $(property_files) $(jgss_property_files) \
+all_property_files = $(property_files) \
     java/util/logging/logging.properties
 
 property_files = \
@@ -26610,7 +26610,7 @@ $(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDEN
 @ONESTEP_TRUE@	@echo Compiling Java sourcefiles...
 @ONESTEP_TRUE@	@: $(call write_entries_to_file,$?,libgcj.sourcelist)
 @ONESTEP_TRUE@	$(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) @libgcj.sourcelist
-
+@ONESTEP_TRUE@	echo > classes.stamp
 # This next rule seems backward, but reflects the fact that 1) all
 # classfiles are compiled in one go when classes.stamp is built and 2)
 # anything which depends on a particular .class file must wait until