diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 852f0f2755..fa3de16d40 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-10  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* config/s390/s390.mh (NATDEPFILES): Add linux-waitpid.o.
+
 2013-09-09  Andrew Burgess  <aburgess@broadcom.com>
 
 	* top.c (quit_confirm): Remove use of deprecated_init_ui_hook.
diff --git a/gdb/config/s390/s390.mh b/gdb/config/s390/s390.mh
index a53835c4fa..76d82e5777 100644
--- a/gdb/config/s390/s390.mh
+++ b/gdb/config/s390/s390.mh
@@ -2,6 +2,7 @@
 NAT_FILE= config/nm-linux.h
 NATDEPFILES= inf-ptrace.o fork-child.o s390-nat.o \
 	linux-thread-db.o proc-service.o \
-	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
+	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
+	linux-waitpid.o
 NAT_CDEPS = $(srcdir)/proc-service.list
 LOADLIBES = -ldl $(RDYNAMIC)