diff --git a/src/ChangeLog b/src/ChangeLog
index 9f32abd2d25..4fffc04b7fa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-04  Andreas Schwab  <schwab@suse.de>
+
+	* xfns.c (Fx_wm_set_size_hint): Add missing return value.
+
 2008-11-03  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xfns.c (Fx_wm_set_size_hint): New function.
diff --git a/src/xfns.c b/src/xfns.c
index 17cbed27898..166cca63f2b 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3114,6 +3114,7 @@ If FRAME is nil, use the selected frame.  */)
   BLOCK_INPUT;
   x_wm_set_size_hint (f, 0, 0);
   UNBLOCK_INPUT;
+  return Qnil;
 }
 
 DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,