diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 76f9c5826c..568b00e65c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-03  Doug Evans  <dje@google.com>
+
+	* gdb.dwarf2/pr13961.S: Add file and source location, but leave
+	commented out.
+
 2012-05-03  Yao Qi  <yao@codesourcery.com>
 
 	* gdb.base/catch-syscall.exp: Skip it before compilation if target
diff --git a/gdb/testsuite/gdb.dwarf2/pr13961.S b/gdb/testsuite/gdb.dwarf2/pr13961.S
index 8d333e7574..3e2b33408f 100644
--- a/gdb/testsuite/gdb.dwarf2/pr13961.S
+++ b/gdb/testsuite/gdb.dwarf2/pr13961.S
@@ -45,6 +45,12 @@
 	.type	baz, @object
 	.size	baz, 4
 baz:
+#if 0
+	/* This is disabled because when it was accidentally left out it
+	   caused a segv when used with .gdb_index.  */
+	.file	1 "foo.c"
+	.loc	1 12 0
+#endif
 	.zero	4
 
 	.text