diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 02da383817..9478ccd379 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-06  Jim Blandy  <jimb@redhat.com>
+
+	* config/s390/nm-linux.h: Watchpoints are either continuable or
+ 	steppable, not both.  The S/390 has continuable watchpoints, so
+ 	delete the #definition of HAVE_STEPPABLE_WATCHPOINT.
+
 2001-12-04  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* go32-nat.c (go32_fetch_registers): Remove call to register_buffer
diff --git a/gdb/config/s390/nm-linux.h b/gdb/config/s390/nm-linux.h
index 242d57cf42..52f26dfc0f 100644
--- a/gdb/config/s390/nm-linux.h
+++ b/gdb/config/s390/nm-linux.h
@@ -49,7 +49,6 @@ extern int kernel_u_size (void);
 
 #define TARGET_HAS_HARDWARE_WATCHPOINTS
 #define HAVE_CONTINUABLE_WATCHPOINT
-#define HAVE_STEPPABLE_WATCHPOINT
 #define target_insert_watchpoint(addr, len, type)  \
   s390_insert_watchpoint (PIDGET (inferior_ptid), addr, len, type)