diff --git a/src/ChangeLog b/src/ChangeLog
index d5c53ff7a02..a4bad57e4c0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,7 +2,9 @@
 
 	* puresize.h (pure_write_error): Mark as NO_RETURN.
 
-	* lisp.h (args_out_of_range, args_out_of_range_3): Likewise.
+	* lisp.h (args_out_of_range, args_out_of_range_3)
+	(Fkill_buffer): Likewise.
+	
 
 2006-04-08  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/lisp.h b/src/lisp.h
index 5d1b3266a0d..049fb989cc8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3032,7 +3032,7 @@ extern void syms_of_frame P_ ((void));
 extern Lisp_Object decode_env_path P_ ((char *, char *));
 extern Lisp_Object Vinvocation_name, Vinvocation_directory;
 extern Lisp_Object Vinstallation_directory, empty_string;
-EXFUN (Fkill_emacs, 1);
+EXFUN (Fkill_emacs, 1) NO_RETURN;
 #if HAVE_SETLOCALE
 void fixup_locale P_ ((void));
 void synchronize_system_messages_locale P_ ((void));