diff --git a/ChangeLog b/ChangeLog
index a549a58aa..b533b0b68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* hw/xfree86/utils/xorgcfg/options.c: 
+	Pass sizeof the correct buffer to XmuSnprintf. (Coverity #489)
+
 2006-03-10  Eric Anholt  <anholt@FreeBSD.org>
 
 	* hw/kdrive/ephyr/ephyr.c: (ephyrMapFramebuffer):
diff --git a/hw/xfree86/utils/xorgcfg/options.c b/hw/xfree86/utils/xorgcfg/options.c
index 35f894ceb..4187c1c3d 100644
--- a/hw/xfree86/utils/xorgcfg/options.c
+++ b/hw/xfree86/utils/xorgcfg/options.c
@@ -334,7 +334,7 @@ OptionsPopup(XF86OptionPtr *opts)
     if (!nomodules) {
 	if (menu)
 	    XtDestroyWidget(menu);
-	XmuSnprintf(menuName, sizeof(buf), "optionM%d", menuN);
+	XmuSnprintf(menuName, sizeof(menuName), "optionM%d", menuN);
 	menuN = !menuN;
 	menu = XtCreatePopupShell(menuName, simpleMenuWidgetClass, button,
 				  NULL, 0);