diff --git a/ChangeLog b/ChangeLog
index 79151eee0..ef6fcf189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-11  Oliver Kiddle  <opk@zsh.org>
+
+	* 20254: Completion/Base/Core/_tags: restrict the scope of the
+	default tag-order to fix a problem with cdrecord completion
+
 2004-08-07  Oliver Kiddle  <opk@zsh.org>
 
 	* 20237: Completion/Unix/Command/_screen: rewrite completion of
diff --git a/Completion/Base/Core/_tags b/Completion/Base/Core/_tags
index 23cfec877..63087e20d 100644
--- a/Completion/Base/Core/_tags
+++ b/Completion/Base/Core/_tags
@@ -41,6 +41,7 @@ if (( $# )); then
     "$_sort_tags" "$@"
   else
     zstyle -a ":completion:${curcontext}:" tag-order order ||
+        (( ! ${@[(I)options]} )) ||
         order=('(|*-)argument-* (|*-)option[-+]* values' options)
 
     for tag in $order; do