diff --git a/ChangeLog b/ChangeLog
index 49e6bf76ea..0cbd719114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-19  Roland McGrath  <roland@baalperazim.frob.com>
 
+	* Makerules (Versions.all, sysd-versions): Test $(sysd-sorted-done)
+	rather than $(sysd-dirs-done) to protect these rules.
+
 	* Makerules (version-renames.def): Target removed.
 	(Versions.all): Depend on soversions.i directly and parse it.
 
diff --git a/Makerules b/Makerules
index 2ee7e7e278..d64f35254b 100644
--- a/Makerules
+++ b/Makerules
@@ -278,7 +278,7 @@ no_deps=t
 endif
 
 # Generate version maps, but wait until sysdep-subdirs is known
-ifdef sysd-dirs-done
+ifeq ($(sysd-sorted-done),t)
 ifeq ($(versioning),yes)
 -include $(common-objpfx)sysd-versions
 $(addprefix $(common-objpfx),$(version-maps)): $(common-objpfx)sysd-versions
@@ -313,7 +313,7 @@ $(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \
 	mv -f $@T $@
 endif # avoid-generated
 endif # $(versioning) = yes
-endif # sysd-dirs-done
+endif # sysd-sorted-done
 
 
 ifndef compile-command.S