diff --git a/ChangeLog b/ChangeLog
index 18c22c6bc..5d0a1d658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-25  Clint Adams  <clint@zsh.org>
+
+	* 21683: Completion/X/Command/_urxvt: more fixes
+	to urxvt completion.
+
 2005-08-23  Clint Adams  <clint@zsh.org>
 
 	* 21682: Completion/Unix/Command/_subversion: handle usage output
diff --git a/Completion/X/Command/_urxvt b/Completion/X/Command/_urxvt
index f3cf0bad1..af227552a 100644
--- a/Completion/X/Command/_urxvt
+++ b/Completion/X/Command/_urxvt
@@ -1,30 +1,39 @@
 #compdef urxvt
-_xt_arguments \
-  -+{ls,j,ptab,sb,sr,st,si,sk,sw,ip,ipf,ut,vb,tcw,insecure,uc,bc,pb,b,scc,ssr} \
-  -help \
-  '-tn:string:' \
-  '-C:intercept console messages:' \
-  '-sbt:scrollbar thickness:' \
-  '-tint:tint color:_x_color' \
-  '-fade:fade percent:' \
-  '-sh:shade percent:' \
+
+_x_arguments \
+  -+{rv,ls,j,ptab,sb,sr,st,si,sk,sw,ip,ipf,ut,vb,tcw,insecure,uc,bc,pb,bl,ssc,ssr} \
+  '-tn:terminal type:' \
+  '-C[intercept console messages]' \
+  '-iconic[start iconic]' \
+  '-sbt[scroll bar thickness]:pixels:' \
+  '-tint[tint color]:color:_x_color' \
+  '-fade[make colors darker when losing focus]:percentage:' \
+  '-sh[shade background when tinting]:percentage:' \
+  '-bg:background color:_x_color' \
+  '-fg:foreground color:_x_color' \
   '-cr:cursor color:_x_color' \
   '-pr:pointer color:_x_color' \
-  '-pr2:pointer bg color:_x_color'\
-  '-pixmap:pixmap:' \
-  '-fb:bold font:' \
-  '-fi:italic font:' \
-  '-fbi:bold italic font:' \
-  '-im:name of input method:' \
-  '-pt:input style style = OverTheSpot|OffTheSpot|Root:'\
-  '-imlocale:locale to use for input method:' \
-  '-imfont:fontset for styles OverTheSpot and OffTheSpot:' \
-  '-n:con name for window:' \
-  '-sl:number of scrolled lines to save:' \
-  '-embed:window id to embed terminal in:' \
+  '-pr2:pointer background color:_x_color' \
+  '-bd:border color:_x_color' \
+  '-pixmap:pixmap:_files' \
+  '-fn:normal font:_x_font' \
+  '-fb:bold font:_x_font' \
+  '-fi:italic font:_x_font' \
+  '-fbi:bold italic font:_x_font' \
+  '-im:input method:(SCIM)' \
+  '-pt:input style:(OverTheSpot OffTheSpot Root)' \
+  '-imlocale:locale input method:_locales' \
+  '-imfont:fontset for styles OverTheSpot and OffTheSpot:_x_font' \
+  '-name:client instance, icon, and title strings:' \
+  '-title:title name for window:' \
+  '-n:icon name for window:' \
+  '-sl:save lines:' \
+  '-embed:window id to embed terminal in:_x_window' \
   '-pty-fd:file descriptor of pty to use:' \
   '-w:external border in pixels:' \
   '-b:internal border in pixels:' \
   '-lsp:number of extra pixels between rows:' \
-  '-mod:meta modifier = alt|meta|hyper|super|mod1|...|mod5:' \
-  '-e:command to execute: _command_names -e:*::program arguments: _normal'
+  '-mod:meta modifier:_x_modifier' \
+  '-e:program: _command_names -e:*::program arguments: _normal' \
+  '-help[print help]' \
+  '--help[list long options]'