diff --git a/ChangeLog b/ChangeLog
index c1f353484..66b03f116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-12  Mikael Magnusson <mikachu@gmail.com>
+
+	* 29245: Completion/X/Command/_xset: pass -O instead of -o
+	to _describe.
+
 2011-05-12  Mikael Magnusson <mikachu@gmail.com>
 
 	* Nikolai Weibull: 29124: Completion/Unix/Command/_git: Fix
@@ -14669,5 +14674,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5294 $
+* $Revision: 1.5295 $
 *****************************************************
diff --git a/Completion/X/Command/_xset b/Completion/X/Command/_xset
index 819a2040d..53ec635d4 100644
--- a/Completion/X/Command/_xset
+++ b/Completion/X/Command/_xset
@@ -27,8 +27,8 @@ _xset_compopts () {
       tmp=("$tmp[@]" "$opt")
     fi
   done
-  _describe -o options tmp -- ||
-  _describe -o options allopts --
+  _describe -O options tmp -- ||
+  _describe -O options allopts --
 }
 
 _xset_compfpadd () {