diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e025f85d1ae..e09a4320231 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+Mon Oct 21 14:00:37 1996  Michael Snyder  <msnyder@cleaver.cygnus.com>
+
+	* gdb.base/setshow.exp: New file, tests show and set.
+	* gdb.base/setshow.c:   New file, tests show and set.
+	* gdb.base/help.exp: Add test for help set|show annotate.
+	* gdb.base/default.exp: Add test for set|show annotate.
+
 Tue Oct 15 16:45:02 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* config/sim-gdb.exp (gdb_target_sim):  Remove setting of height
diff --git a/gdb/testsuite/gdb.base/setshow.c b/gdb/testsuite/gdb.base/setshow.c
new file mode 100644
index 00000000000..2ac7508f0fb
--- /dev/null
+++ b/gdb/testsuite/gdb.base/setshow.c
@@ -0,0 +1,16 @@
+/* IMPORTANT: leave this comment in the first line of this source file. */
+/*            this will guarantee that line 1 contains no code. */
+
+#include <stdio.h>
+
+int 
+main(argc, argv)
+     int argc;
+     char **argv;
+{
+  int i = 1;
+
+  while (i < argc)
+    printf ("%s ", argv[i++]);
+  return 0;
+}