diff --git a/src/ChangeLog b/src/ChangeLog
index fd864a460f4..99cdde19234 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
 	Fix more problems found by GCC 4.6.0's static checks.
 
+	* menu.c (Fx_popup_menu): Don't assume error_name lacks printf formats.
+
 	* fns.c (Fstring_to_unibyte): Don't rely on undefined behavior
 	by passing a long int to a printf format expecting an int.
 
diff --git a/src/menu.c b/src/menu.c
index a9098deed7e..3bfb74863ae 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1340,7 +1340,7 @@ no quit occurs and `x-popup-menu' returns nil.  */)
 
   UNGCPRO;
 
-  if (error_name) error (error_name);
+  if (error_name) error ("%s", error_name);
   return selection;
 }