diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a4f2b78cd9..a4f2df5230 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 18 11:25:43 1995  Kung Hsu  <kung@mexican.cygnus.com>
+
+	* remote-os9k.c (rombug_open): Fix a bug in exception handling
+	command.
+	* remote-os9k.c (rombug_write_inferior_memory): reset buffer after
+	write.
+
 Tue Jan 17 09:48:38 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
 
 	* parse.c (_initialize_parse): Improve wording of names of
diff --git a/gdb/remote-os9k.c b/gdb/remote-os9k.c
index c9a1a97c7f..9b6f7bafa4 100644
--- a/gdb/remote-os9k.c
+++ b/gdb/remote-os9k.c
@@ -366,10 +366,10 @@ rombug_open(args, from_tty)
     printf("Remote %s connected to %s\n", target_shortname,
 	   dev_name);
 
+  rombug_fetch_registers();
+
   printf_monitor ("ov e \r");
   expect_prompt(1);
-
-  rombug_fetch_registers();
   bufaddr = 0;
   buflen = 0;
 }
@@ -763,6 +763,8 @@ rombug_write_inferior_memory (memaddr, myaddr, len)
   is_trace_mode = 0;
   expect_prompt (1);
 
+  bufaddr = 0;
+  buflen = 0;
   return len;
 }