diff --git a/ChangeLog b/ChangeLog
index b85cddfb4f..966759df8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-05-29  Ulrich Drepper  <drepper@redhat.com>
 
+	* Makefile: Add GNU make magic.
+
 	* inet/Makefile (CFLAGS-rcmd.c, CFLAGS-rexec.c, CFLAGS-ruserpass.c):
 	Removed.
 	* inet/rcmd.c: Remove __P.  Remove unused variables.
diff --git a/Makefile b/Makefile
index 6e4a7670ba..5cf82ebc95 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,9 @@ mv -f $@.new $@
 endef
 endif
 
+# We don't want to run anything here in parallel.
+.NOTPARALLEL:
+
 configure: configure.in aclocal.m4; $(autoconf-it)
 %/configure: %/configure.in aclocal.m4; $(autoconf-it)