diff --git a/src/ChangeLog b/src/ChangeLog
index 3b9669b46a9..819ccd60f72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsterm.m (ns_update_auto_hide_menu_bar): Only for OSX 10.6 or
+	later (Bug#8403).
+
 2011-04-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Add lexical binding.
diff --git a/src/nsterm.m b/src/nsterm.m
index 91f0cbba585..f783bbe025f 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -583,6 +583,8 @@ ns_menu_bar_should_be_hidden (void)
 static void
 ns_update_auto_hide_menu_bar (void)
 {
+#ifdef NS_IMPL_COCOA
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
   BLOCK_INPUT;
 
   NSTRACE (ns_update_auto_hide_menu_bar);
@@ -615,6 +617,8 @@ ns_update_auto_hide_menu_bar (void)
     }
 
   UNBLOCK_INPUT;
+#endif
+#endif
 }