diff --git a/ChangeLog b/ChangeLog
index eccbacfa0..5b135edab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-24  Clint Adams  <clint@zsh.org>
+
+        * 19201: Completion/Unix/Command/_screen: patch from
+        Yasuhiro Hayase to complete normal commands after screen.
+
 2003-10-07  Bart Schaefer  <schaefer@zsh.org>
 
 	* users/6663: Completion/compaudit: follow symlinks when checking
diff --git a/Completion/Unix/Command/_screen b/Completion/Unix/Command/_screen
index 89ddc9a96..6995dfdec 100644
--- a/Completion/Unix/Command/_screen
+++ b/Completion/Unix/Command/_screen
@@ -69,7 +69,8 @@ _arguments \
   '(-)-v[print screen version]' \
   '(-)-wipe[do nothing, clean up SockDir]' \
   '-x[attach to a not detached screen. (Multi display mode).]' \
-  '-X[execute <cmd> as a screen command in the specified session.]:screencmd:(${scr_cmds[@]})'
+  '-X[execute <cmd> as a screen command in the specified session.]:screencmd:(${scr_cmds[@]})' \
+  '*::arguments: _normal'
 
 case $state in
   sessionname)