diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a43f61a863..ea682aad72 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-02  Mark Kettenis  <kettenis@gnu.org>
+
+	* config/alpha/nm-fbsd.h (CANNOT_STEP_BREAKPOINT): Define.
+
 2000-06-01  Michael Snyder  <msnyder@seadog.cygnus.com>
 
 	* sol-thread.c (rw_common): Circumstances (eg. a bug in Sun's 
diff --git a/gdb/config/alpha/nm-fbsd.h b/gdb/config/alpha/nm-fbsd.h
index cb72a35956..59321b999b 100644
--- a/gdb/config/alpha/nm-fbsd.h
+++ b/gdb/config/alpha/nm-fbsd.h
@@ -29,6 +29,9 @@
 
 /* We can attach and detach.  */
 #define ATTACH_DETACH
+
+/* The Alpha does not step over a breakpoint.  */
+#define CANNOT_STEP_BREAKPOINT
 
 
 /* Shared library support.  */