diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3e4e39dfbe..f874e3eaa0 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-31  Mark Kettenis  <kettenis@gnu.org>
+
+	* gdb.asm/asm-source.exp: Set asm-note to "openbsd" for
+	*-*-openbsd*.
+	* gdb.asm/openbsd.inc: New file.
+
 2004-01-30  Mark Kettenis  <kettenis@gnu.org>
 
 	* gdb.asm/asm-source.exp: Strip -Wl, from link-flags.  Don't
diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
index 411d13d06b..75e64b484e 100644
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -124,6 +124,13 @@ if { [istarget "*-*-netbsdelf*"]
     set asm-note "netbsd"
 }
 
+# On OpenBSD/ELF we need a similar note section.  We make no attempt
+# of handing a.out here since most OpenBSD/a.out systems use a rather
+# outdated assembler that doesn't assemble this test's code anyway.
+if { [istarget "*-*-openbsd*"] } then {
+    set asm-note "openbsd"
+}
+
 # Watch out, we are invoking the assembler, but the testsuite sets multilib
 # switches according to compiler syntax.  If we pass these options straight
 # to the assembler, they won't always make sense.  If we don't pass them to
diff --git a/gdb/testsuite/gdb.asm/openbsd.inc b/gdb/testsuite/gdb.asm/openbsd.inc
new file mode 100644
index 0000000000..90e3dbd0d2
--- /dev/null
+++ b/gdb/testsuite/gdb.asm/openbsd.inc
@@ -0,0 +1,12 @@
+	comment "openbsd .note"
+
+.section	".note.openbsdbsd.ident", "a"
+	.p2align	2
+
+	.long	8
+	.long	4
+	.long	1
+	.ascii	"OpenBSD\0\0"
+	.long	200311
+
+	.p2align	2