23 files changed, 124 insertions, 34 deletions
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index a89b7d923..e54c6c0d2 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -200,6 +200,7 @@ _slrn
 _socket
 _sort
 _spamassassin
+_sqlite
 _sqsh
 _ssh
 _stgit
@@ -239,6 +240,7 @@ _unison
 _units
 _user_admin
 _uzbl
+_vcsh
 _vim
 _vorbis
 _vorbiscomment
diff --git a/Completion/Unix/Command/_bittorrent b/Completion/Unix/Command/_bittorrent
index 8c31a11ae..f7da2047a 100644
--- a/Completion/Unix/Command/_bittorrent
+++ b/Completion/Unix/Command/_bittorrent
@@ -50,18 +50,18 @@ case $service in
       "--max_initiate+[specify peers needed before stopping initiating new connections]:peers:"\
       "--report_hash_failures+[report hash failures to user]:enable:(0 1)"\
       "--rarest_first_priority_cutoff+[specify peers which need to have a piece before other partials take priority over rarest first]:peers:"\
-      ':torrent file:_files -g "*.torrent"' \
+      ':torrent file:_files -g "*.torrent(-.)"' \
       && return 0
   ;;
 
 # Next up are the torrent file manipulation programs.
 
   btshowmetainfo)
-   _files -g "*.torrent" && return 0
+   _files -g "*.torrent(-.)" && return 0
    ;;
 
   btrename)
-   _files -g '*.torrent' && return 0
+   _files -g '*.torrent(-.)' && return 0
   ;;
 
   btmakemetafile)
@@ -74,7 +74,7 @@ case $service in
   ;;
 
   btreannounce)
-   _files -g '*.torrent' && return 0
+   _files -g '*.torrent(-.)' && return 0
   ;;
 
 # Lastly the tracker.
diff --git a/Completion/Unix/Command/_bogofilter b/Completion/Unix/Command/_bogofilter
index 980d3155e..44953cc71 100644
--- a/Completion/Unix/Command/_bogofilter
+++ b/Completion/Unix/Command/_bogofilter
@@ -29,16 +29,16 @@ _bogoutil() {
 	{-y,--timestamp-date=}'[date for when unknown]:date in YYYYMMDD format' \
 	'(--input-file -I)'{-I,--input-file=}'[input file]:input file:_files' \
 	{-x,--debug-flags=}'[debug flags]:debug flags:' \
-	"($_bogoutil_actions)"{-d,--dump=}'[print contents of db]:database file:_files -g "*.db"' \
+	"($_bogoutil_actions)"{-d,--dump=}'[print contents of db]:database file:_files -g "*.db(-.)"' \
   	"($_bogoutil_actions)"{-l,--load=}'[load file into db]:textfile:_files' \
-	"($_bogoutil_actions)"{-u,--upgrade=}'[upgrade wordlist version]:database file:_files -g "*.db"' \
+	"($_bogoutil_actions)"{-u,--upgrade=}'[upgrade wordlist version]:database file:_files -g "*.db(-.)"' \
 	"($_bogoutil_actions)"'-m[perform maintenance functions]:file:_files' \
   	"($_bogoutil_actions)"'-w[display token information]:database file or directory:_files' \
   	"($_bogoutil_actions)"'-p[display token probability information]:database file or directory:_files' \
 	"($_bogoutil_actions)"'-H[print histogram]:database file or directory:_files' \
 	"($_bogoutil_actions)"'-r[recalculate ROBX]:database:_files -/' \
 	"($_bogoutil_actions)"'-R[recalculate and save ROBX]:database:_files -/' \
-	"($_bogoutil_actions)"{-k,--db-cachesize=}'[set Berkeley DB cache size]:size in MB:' \
+	"($_bogoutil_actions)"{-k,--db-cachesize=}'[set Berkeley DB cache size]:size in MB' \
 	"($_bogoutil_actions)"'--db-verify[verify database]:database:_files -/' \
 	"($_bogoutil_actions)"'--db-recover[run regular recovery]:database:_files -/' \
 	"($_bogoutil_actions)"'--db-recover-harder[run catastrophic recovery]:database:_files -/' \
diff --git a/Completion/Unix/Command/_cdrdao b/Completion/Unix/Command/_cdrdao
index e22ceb509..ce3742bc7 100644
--- a/Completion/Unix/Command/_cdrdao
+++ b/Completion/Unix/Command/_cdrdao
@@ -91,7 +91,7 @@ common_args=(
 declare -ga common_toc_args
 common_toc_args=(
   $common_args
-  ':TOC file:_files -g "*.toc"')
+  ':TOC file:_files -g "*.toc(-.)"')
 
 declare -ga common_device_args
 common_device_args=(
diff --git a/Completion/Unix/Command/_cplay b/Completion/Unix/Command/_cplay
index 3b4219173..f1755c1a1 100644
--- a/Completion/Unix/Command/_cplay
+++ b/Completion/Unix/Command/_cplay
@@ -5,4 +5,4 @@ _arguments -s \
   '-r[toggle playlist repeat mode]' \
   '-R[toggle playlist random mode]' \
   '-v[toggle PCM and MASTER volume control]' \
-  '*:playlist or directory or audio file:_files -g "*.(mp3|mp2|ogg|669|amf|ams|dsm|far|it|med|mod|mt2|mtm|okt|s3m|stm|ult|gdm|xm|m3u|pls|spx|wav|au)"'
+  '*:playlist or directory or audio file:_files -g "*.(mp3|mp2|ogg|669|amf|ams|dsm|far|it|med|mod|mt2|mtm|okt|s3m|stm|ult|gdm|xm|m3u|pls|spx|wav|au)(-.)"'
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 8a48c04b7..5ed921850 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3636,7 +3636,7 @@ _git-index-pack () {
     '--stdin[read pack from stdin and instead write to specified file]' \
     $stdin_opts \
     '--strict[die if the pack contains broken objects or links]' \
-    ':pack file:_files -g "*.pack"'
+    ':pack file:_files -g "*.pack(-.)"'
 }
 
 (( $+functions[_git-merge-file] )) ||
@@ -4075,7 +4075,7 @@ _git-pack-redundant () {
     '(:)--all[process all packs]' \
     '--alt-odb[do not require objects to be present in local packs]' \
     '--verbose[output some statistics to standard error]' \
-    '(--all)*::packs:_files -g "*.pack"'
+    '(--all)*::packs:_files -g "*.pack(-.)"'
 }
 
 (( $+functions[_git-rev-list] )) ||
diff --git a/Completion/Unix/Command/_hg b/Completion/Unix/Command/_hg
index aeb64f660..f48598278 100644
--- a/Completion/Unix/Command/_hg
+++ b/Completion/Unix/Command/_hg
@@ -420,8 +420,8 @@ _hg_cmd_backout() {
     '--parent[parent to choose when backing out merge]' \
     '(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
     '(--rev -r)'{-r+,--rev}'[revision]:revision:_hg_tags' \
-    '(--message -m)'{-m+,--message}'[use <text> as commit message]:text:' \
-    '(--logfile -l)'{-l+,--logfile}'[read commit message from <file>]:log file:_files -g \*.txt'
+    '(--message -m)'{-m+,--message}'[specify commit message]:text' \
+    '(--logfile -l)'{-l+,--logfile}'[read commit message from specified file]:log file:_files'
 }
 
 _hg_cmd_bisect() {
@@ -472,8 +472,8 @@ _hg_cmd_clone() {
 _hg_cmd_commit() {
   _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
   '(--addremove -A)'{-A,--addremove}'[mark new/missing files as added/removed before committing]' \
-  '(--message -m)'{-m+,--message}'[use <text> as commit message]:text:' \
-  '(--logfile -l)'{-l+,--logfile}'[read commit message from <file>]:log file:_files -g \*.txt' \
+  '(--message -m)'{-m+,--message}'[specify commit message]:text' \
+  '(--logfile -l)'{-l+,--logfile}'[read commit message from specified file]:log file:_files' \
   '(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \
   '(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
   '*:file:_hg_files'
diff --git a/Completion/Unix/Command/_ldd b/Completion/Unix/Command/_ldd
index e739181d6..d59294717 100644
--- a/Completion/Unix/Command/_ldd
+++ b/Completion/Unix/Command/_ldd
@@ -28,5 +28,5 @@ fi
 
 _arguments $args \
   '*: : _alternative
-    "executables:executable:_files -g \^\*.so\(\*\)"
-      "shared-objects:shared object:_files -g \*.so"'
+    "executables:executable:_files -g \^\*.so\(\-\*\)"
+      "shared-objects:shared object:_files -g \*.so\(-.\)"'
diff --git a/Completion/Unix/Command/_metaflac b/Completion/Unix/Command/_metaflac
index e6cd13e13..14095e9f9 100644
--- a/Completion/Unix/Command/_metaflac
+++ b/Completion/Unix/Command/_metaflac
@@ -50,7 +50,7 @@ _metaflac_opers=(
 )
 
 _arguments "$_metaflac_opts[@]" \
-    "*:FLAC file:_files -g \*.flac" \
+    "*:FLAC file:_files -g \*.flac\(-.\)" \
     - "shortcuts" \
     "$_metaflac_shorts[@]" \
     - "(operations)" \
diff --git a/Completion/Unix/Command/_osc b/Completion/Unix/Command/_osc
index c15b40af2..a18890f5e 100644
--- a/Completion/Unix/Command/_osc
+++ b/Completion/Unix/Command/_osc
@@ -16,8 +16,8 @@
 # version 0.2
 #
 
-OSC_BUILD_TARGETS="openSUSE_10.2 openSUSE_10.3 openSUSE_11.0 openSUSE_11.1 openSUSE_11.2 openSUSE_11.3 openSUSE_Factory"
-OSC_PROJECTS="openSUSE:Factory openSUSE:11.2 openSUSE:11.3 openSUSE:11.1 openSUSE:11.0 openSUSE:10.3"
+OSC_BUILD_TARGETS="openSUSE_11.2 openSUSE_11.3 openSUSE_11.4 openSUSE_12.1 openSUSE_Tumbleweed openSUSE_Factory SLE_11_SP1"
+OSC_PROJECTS="openSUSE:Factory openSUSE:Tumbleweed openSUSE:12.1 openSUSE:11.4 openSUSE:11.2 openSUSE:11.3"
 
 # user defined variables $OSC_BUILD_TARGETS_EXTRA and
 # $OSC_PROJECTS_EXTRA can add to the project/build target list
diff --git a/Completion/Unix/Command/_pax b/Completion/Unix/Command/_pax
index 5d0edac88..7ebaa6aa5 100644
--- a/Completion/Unix/Command/_pax
+++ b/Completion/Unix/Command/_pax
@@ -19,7 +19,7 @@ _arguments -s \
   123b 124b 125b 126b)' \
   '-c[match all but specified]' \
   '-d[match only directory but not contents]' \
-  '-f:archive:_files -g "*.(tar|cpio)"' \
+  '-f:archive:_files -g "*.(tar|cpio)(-.)"' \
   '-i[interactively rename files]' \
   '-j[filter archive through bzip2]' \
   '-k[do not overwrite existing files]' \
diff --git a/Completion/Unix/Command/_rubber b/Completion/Unix/Command/_rubber
index 526abaaa8..09e289aa2 100644
--- a/Completion/Unix/Command/_rubber
+++ b/Completion/Unix/Command/_rubber
@@ -43,7 +43,7 @@ case "$service" in
       {-f,--force}'[force at least one compilation]' \
       '--inplace[compile the documents from their source directory]' \
       \*{-W,--warn}'=[report warnings of the given TYPE]:warnings:(all boxes misc refs)' \
-      '*:LaTeX files:_files -g \*.\(tex\|dtx\|lhs\|w\)'
+      '*:LaTeX files:_files -g "*.(tex|dtx|lhs|w)(-.)"'
       return 0
 	;;
 	
@@ -64,7 +64,7 @@ case "$service" in
       '--errors[show all errors that occured during compilation]' \
       '--refs[show the list of undefined references]' \
       '--warnings[show all LaTeX warnings]' \
-      ':LaTeX file:_files -g \*.\(tex\|dtx\|lhs\|w\)'
+      ':LaTeX file:_files -g "*.(tex|dtx|lhs|w)(-.)"'
       return 0
   ;;
 esac
diff --git a/Completion/Unix/Command/_sisu b/Completion/Unix/Command/_sisu
index d3d53275b..6ca2abfaa 100644
--- a/Completion/Unix/Command/_sisu
+++ b/Completion/Unix/Command/_sisu
@@ -59,4 +59,4 @@ _arguments -s -C -M 'r:|[_-]=* r:|=*' \
   '--to=dom[XML dom based input representation, experimental]' \
   '--convert=footnotes[embedded footnotes]' \
   '--to=current[current markup]' \
-  '*:SiSU files:_files -g "*.(sst|ssm)(.)"'
+  '*:SiSU files:_files -g "*.(sst|ssm)(-.)"'
diff --git a/Completion/Unix/Command/_sqlite b/Completion/Unix/Command/_sqlite
new file mode 100644
index 000000000..05027c603
--- /dev/null
+++ b/Completion/Unix/Command/_sqlite
@@ -0,0 +1,50 @@
+#compdef sqlite sqlite3
+
+local ret opt display_opt sqlite3
+local -a options output_modes exclusive dashes
+
+[[ $service = sqlite3 ]] && sqlite3=true || unset sqlite3
+
+# sqlite options require a single hyphen, but
+# sqlite3 allows options with one or two
+dashes=( '' )
+(( $+sqlite3 )) && dashes+=( - )
+
+options=(
+  '(-init --init)'$^dashes'-init[startup file]:file containing SQLite commands:_files'
+  $^dashes'-echo[echo commands]'
+)
+
+exclusive=( {,-}-{no,}header )
+options+=(
+  "($exclusive)"$^dashes'-header[turn headers on]'
+  "($exclusive)"$^dashes'-noheader[turn headers off]'
+)
+
+output_modes=( column HTML line list )
+(( $+sqlite3 )) && output_modes+=( csv )
+exclusive=( $^dashes-${^output_modes:l} )
+for display_opt in $output_modes ; do
+  # finagle the description to match the way SQLite's -help formats them
+  opt=$display_opt:l
+  [[ $opt = $display_opt ]] && display_opt="'$display_opt'"
+  options+=( "($exclusive)"$^dashes"-${opt}[set output mode to $display_opt]" )
+done
+
+options+=(
+  $^dashes'-separator[set output field separator]:string to separate output fields:'
+  $^dashes'-nullvalue[set null value string]:string for NULL values:'
+  '(- :)'$^dashes'-version[show SQLite version]'
+  '(- :)'$^dashes'-help[show help]'
+  '1:SQLite database file:_files'
+  '(- :)2:SQL to run'
+)
+
+(( $+sqlite3 )) && options+=(
+  $^dashes'-bail[stop after hitting an error]'
+  '(-*batch -*interactive)'$^dashes'-batch[force batch I/O]'
+  '(-*batch -*interactive)'$^dashes'-interactive[force interactive I/O]'
+  $^dashes'-stats[print memory stats before each finalize]'
+)
+
+_arguments $options
diff --git a/Completion/Unix/Command/_stgit b/Completion/Unix/Command/_stgit
index 129b21a92..b2f2aeafa 100644
--- a/Completion/Unix/Command/_stgit
+++ b/Completion/Unix/Command/_stgit
@@ -29,7 +29,7 @@ else
     ;;
     (edit|files|goto|rename|log|float|delete|sink|mail|sync|show|pick|hide)
       _wanted -V "patches" expl "patch" \
-	compadd $(stg series --noprefix > /dev/null) \
+	compadd $(stg series --noprefix 2> /dev/null) \
 		&& ret=0
     ;;
     (*)
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 21d809dd1..11d0b69e4 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -18,7 +18,7 @@ _svn () {
 
   if [[ -n $state ]] && (( ! $+_svn_cmds )); then
     typeset -gHA _svn_cmds
-    if _cache_invalid svn-cmds || ! _retrieve_cache svn-cmds; then 
+    if _cache_invalid svn-cmds || ! _retrieve_cache svn-cmds; then
       _svn_cmds=(
 	${=${(f)${${"$(LC_ALL=C _call_program commands svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
       )
@@ -31,7 +31,7 @@ _svn () {
       _wanted commands expl 'svn command' _svn_commands && ret=0
     ;;
     args)
-      local cmd args usage
+      local cmd args usage idx
       typeset -gHA _cache_svn_status _cache_svn_mtime
 
       cmd="${${(k)_svn_cmds[(R)*:$words[1]:*]}:-${(k)_svn_cmds[(i):$words[1]:]}}"
@@ -50,6 +50,9 @@ _svn () {
 	  args=(
 	    ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svn help $cmd)"#(*Valid options:|(#e))}:#* :*}%% #:*}/ (arg|ARG)/:arg:}/(#b)(-##)([[:alpha:]]##) \[--([a-z-]##)\](:arg:)#/(--$match[3])$match[1]$match[2]$match[4] ($match[1]$match[2])--$match[3]$match[4]}
 	  )
+          while (( idx=$args[(I)*--c(l|hangelist):arg:] )); do
+            args[(I)*--c(l|hangelist):arg:]=( \*{--cl,--changelist}':change list:_svn_changelists' )
+          done
 	  _store_cache svn-${cmd}-args args
 	fi
 
@@ -92,6 +95,9 @@ _svn () {
 	      '*:file:_files -g "*(e:_svn_controlled:)"'
             )
           ;;
+          (mergeinfo)
+            args[(r)--show-revs:arg:]=( '--show-revs:revisions:(merged eligible)' )
+          ;;
 	  (propget|propedit)
 	    args+=(
 		'1:property name:_svn_props'
@@ -281,7 +287,7 @@ _svn_urls() {
   if [[ ! -prefix *://? ]] ; then
     zstyle -a ":completion:${curcontext}:" url-schemas urlsch \
      || urlsch=( file:// http:// https:// svn:// svn+ssh:// )
-    
+
     if (( $#urlsch )) ; then
       compset -S '[^:]*'
       _wanted url-schemas expl 'URL schema' compadd -S '' - $urlsch[@] && ret=0
@@ -309,6 +315,14 @@ _svn_props() {
   compadd "$@" -a properties && return 0
 }
 
+(( $+functions[_svn_changelists] )) ||
+_svn_changelists() {
+  local cls
+
+  cls=( ${${${(M)${(f)"$(LC_ALL=C _call_program changelists svn status 2>/dev/null)"}:#--- Changelist*}%??}##*\'} )
+  compadd "$@" -a cls && return 0
+}
+
 _subversion () {
   case $service in
     (svn) _svn "$@" ;;
diff --git a/Completion/Unix/Command/_sudo b/Completion/Unix/Command/_sudo
index 384e9358b..f8543f865 100644
--- a/Completion/Unix/Command/_sudo
+++ b/Completion/Unix/Command/_sudo
@@ -3,7 +3,7 @@
 local curcontext="$curcontext" environ e
 local -a args
 
-zstyle -a "$curcontext" environ environ
+zstyle -a ":completion:${curcontext}:" environ environ
 
 for e in "${environ[@]}"
 do local -x "$e"
diff --git a/Completion/Unix/Command/_systemctl b/Completion/Unix/Command/_systemctl
index 69adcf775..3f54092a1 100644
--- a/Completion/Unix/Command/_systemctl
+++ b/Completion/Unix/Command/_systemctl
@@ -43,6 +43,7 @@ _systemctl()
     '--global[Enable/disable unit files globally]' \
     {-f,--force}'[When enabling unit files, override existing symlinks. When shutting down, execute action immediately]' \
     '--defaults[When disabling unit files, remove default symlinks only]' \
+    '--root=[Enable unit files in the specified root directory]:directory:_directories' \
     '*::systemctl command:_systemctl_command'
 }
 
@@ -73,8 +74,13 @@ _hosts_or_user_at_host()
     "status:Show runtime status of one or more units"
     "show:Show properties of one or more units/jobs or the manager"
     "reset-failed:Reset failed state for all, one, or more units"
+    "list-unit-files:List installed unit files"
     "enable:Enable one or more unit files"
     "disable:Disable one or more unit files"
+    "preset:Enable/disable one or more unit files based on preset configuration"
+    "mask:Mask one or more units"
+    "unmask:Unmask one or more units"
+    "link:Link one or more units into the search path"
     "is-enabled:Check whether unit files are enabled"
     "load:Load one or more units"
     "list-jobs:List jobs"
diff --git a/Completion/Unix/Command/_texinfo b/Completion/Unix/Command/_texinfo
index 405de2629..12d964e3f 100644
--- a/Completion/Unix/Command/_texinfo
+++ b/Completion/Unix/Command/_texinfo
@@ -157,7 +157,7 @@ case $state in
     _tags $tags
     while _tags; do
 	if _requested files expl 'info file'; then
-	    _files "$expl[@]" $infopath -g '*.info' && ret=0
+	    _files "$expl[@]" $infopath -g '*.info(-.)' && ret=0
 	fi
 	if _requested items; then
 	    items=(${${(M)${${(f)"$(${info} --output - ${words[1,CURRENT-1]} 2>/dev/null)"}[1,(r)[[:space:]]#--- The Detailed Node Listing ---[[:space:]]#]}:#\* *~\* Menu:*}:/(#b)\*[[:space:]]##([^:]##):(#B)( \(?##\)[^.]#.|(:|))[[:space:]]#(#b)(*)[[:space:]]#/$match[1]${match[2]:+:}$match[2]})
diff --git a/Completion/Unix/Command/_vcsh b/Completion/Unix/Command/_vcsh
new file mode 100644
index 000000000..89588e4b2
--- /dev/null
+++ b/Completion/Unix/Command/_vcsh
@@ -0,0 +1,18 @@
+#compdef vcsh
+
+_arguments \
+	':subcommand:((
+		clone\:"clone from repo"
+		help\:"display help"
+		delete\:"delete repo"
+		enter\:"Enter repo; spawn new \$SHELL"
+		init\:"init & clone from repo"
+		list\:"list all repos"
+		list-tracked\:"list all files tracked by vcsh"
+		list-tracked-by\:"list files tracked by a repo"
+		rename\:"rename repo"
+		run\:"run command on repo"
+		setup\:"set up repo with recommended settings"
+		write-gitignore\:"write .gitignore.d/foo via git ls-files"
+		\<REPO\>\:"Run git command directly"
+	))'
diff --git a/Completion/Unix/Command/_vim b/Completion/Unix/Command/_vim
index 7aec1ecf7..2c9b0a1a4 100644
--- a/Completion/Unix/Command/_vim
+++ b/Completion/Unix/Command/_vim
@@ -46,7 +46,7 @@ arguments=(
   '-D[debugging mode]'
   '-n[no swap file (memory only)]'
   '-nb[start as NetBean server]'
-  {-r,-L}'[list swap files and exit or recover from a swap file]::swap file:_vim_files -g \*.sw\?'
+  {-r,-L}'[list swap files and exit or recover from a swap file]::swap file:_vim_files -g "*.sw?(-.)"'
   '(   -H -F)-A[start in Arabic mode]'
   '(-A    -F)-H[start in Hebrew mode]'
   '(-A -H   )-F[start in Farsi mode]'
diff --git a/Completion/Unix/Command/_vorbiscomment b/Completion/Unix/Command/_vorbiscomment
index 4cefe1a1a..bd7459e04 100644
--- a/Completion/Unix/Command/_vorbiscomment
+++ b/Completion/Unix/Command/_vorbiscomment
@@ -13,6 +13,6 @@ _arguments \
     '(-l)-w[overwrite comments]' \
     '(-l -c)-t[tag and value]:: ' \
     '(-l -t)-c[tag file]::_files' \
-    '1:OGG file:_files -g \*.ogg' \
-    '(-l)2:output OGG file:_files -g \*.ogg' \
+    '1:OGG file:_files -g "*.ogg(-.)"' \
+    '(-l)2:output OGG file:_files -g "*.ogg(-.)"' \
     && return 0
diff --git a/Completion/Unix/Command/_xmms2 b/Completion/Unix/Command/_xmms2
index 95ea04b33..525d5177c 100644
--- a/Completion/Unix/Command/_xmms2
+++ b/Completion/Unix/Command/_xmms2
@@ -198,7 +198,7 @@ _xmms2_radd() {
 _xmms2_addpls() {
   local expl
   _description files expl 'playlist'
-  _files "$expl[@]" -g '*.([mM]3[uU]|[pP][lL][sS])'
+  _files "$expl[@]" -g '*.([mM]3[uU]|[pP][lL][sS])(-.)'
 }
 
 _xmms2() {