diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 553cb7611be..3586c7adc89 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-05  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* configure.tgt [s390*-*-*] (gdb_target_obs): Add corelow.o.
+	* config/s390/s390.mh (NATDEPFILES): Remove corelow.o.
+
 2012-01-05  Khoo Yit Phang  <khooyp@cs.umd.edu>
 
 	* infrun.c (normal_stop): Don't skip calling the normal_stop
diff --git a/gdb/config/s390/s390.mh b/gdb/config/s390/s390.mh
index 03db4a12f04..44c7a9a6c3b 100644
--- a/gdb/config/s390/s390.mh
+++ b/gdb/config/s390/s390.mh
@@ -1,6 +1,6 @@
 # Host: S390, running Linux
 NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o corelow.o s390-nat.o \
+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
 NAT_CDEPS = $(srcdir)/proc-service.list
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 178bad74338..5542af05cac 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -428,7 +428,7 @@ powerpc*-*-*)
 
 s390*-*-*)
 	# Target: S390 running Linux
-	gdb_target_obs="s390-tdep.o solib-svr4.o linux-tdep.o"
+	gdb_target_obs="s390-tdep.o solib-svr4.o corelow.o linux-tdep.o"
 	build_gdbserver=yes
 	;;