diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a49d97b004..7d68058a8d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-19  Andreas Schwab  <schwab@suse.de>
+
+	* progmodes/gud.el (gud-kill-buffer-hook): Don't kill unrelated
+	process.
+
 2005-08-18  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* cus-start.el (minibuffer-prompt-properties): Correct typo.
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 21f61ec1dc8..0577e2a2bb7 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2598,7 +2598,7 @@ It is saved for when this flag is not set.")
 (defun gud-kill-buffer-hook ()
   (setq gud-minor-mode-type gud-minor-mode)
   (condition-case nil
-      (kill-process (get-buffer-process gud-comint-buffer))
+      (kill-process (get-buffer-process (current-buffer)))
     (error nil)))
 
 (defun gud-reset ()