diff --git a/shells/zsh/snapshot/Makefile b/shells/zsh/snapshot/Makefile
index 0e87fc06632..bf9cd0a8a65 100644
--- a/shells/zsh/snapshot/Makefile
+++ b/shells/zsh/snapshot/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2002/12/29 20:08:47 fgsch Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/23 14:21:05 lebel Exp $
 
 COMMENT=	"Z shell, Bourne shell-compatible, release flavor"
 COMMENT-zftp=	"Z shell embedded ftp client"
 
-VERSION=	4.1.0-dev-5
+VERSION=	4.1.1-test-2
 PKGNAME=	zsh-${VERSION:C/-//g}
 DISTNAME=	zsh-${VERSION}
 CATEGORIES=	shells
@@ -26,7 +26,8 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 FLAVORS=	static
-.if ${MACHINE_ARCH:Malpha}
+
+.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mvax}
 # for the time being, force static on alpha
 FLAVOR?=        static
 .else
@@ -34,7 +35,7 @@ FLAVOR?=
 .endif
 
 CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free
+CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free --enable-maildir-support
 
 .if ${FLAVOR:L} == "static"
 CONFIGURE_ENV=	LDFLAGS="-static"
diff --git a/shells/zsh/snapshot/distinfo b/shells/zsh/snapshot/distinfo
index 6da694f1c87..fee84a12f70 100644
--- a/shells/zsh/snapshot/distinfo
+++ b/shells/zsh/snapshot/distinfo
@@ -1,3 +1,3 @@
-MD5 (zsh-4.1.0-dev-5.tar.gz) = df3a5165b53c253586e227bc20903555
-RMD160 (zsh-4.1.0-dev-5.tar.gz) = da413e248b31d33d8aa8b4717e74c21ed24f5a62
-SHA1 (zsh-4.1.0-dev-5.tar.gz) = 636fe7f841f17ba87a0006fdf6a0ad7ca6c9e8d6
+MD5 (zsh-4.1.1-test-2.tar.gz) = dddb5786219f57fef20b0ae3616afc67
+RMD160 (zsh-4.1.1-test-2.tar.gz) = c1c9c63e6542bfed9e73408c072b7ba654d8ada2
+SHA1 (zsh-4.1.1-test-2.tar.gz) = 05bd0d24e42d50fb37616eeaa5d3aab00bce3021
diff --git a/shells/zsh/snapshot/patches/patch-Completion_BSD_Command__bsd_pkg b/shells/zsh/snapshot/patches/patch-Completion_BSD_Command__bsd_pkg
index 5d2463f6bc4..1e039fd5837 100644
--- a/shells/zsh/snapshot/patches/patch-Completion_BSD_Command__bsd_pkg
+++ b/shells/zsh/snapshot/patches/patch-Completion_BSD_Command__bsd_pkg
@@ -1,12 +1,254 @@
-$OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.1 2002/07/01 15:34:04 lebel Exp $
---- Completion/BSD/Command/_bsd_pkg.orig	Fri Feb  1 09:28:31 2002
-+++ Completion/BSD/Command/_bsd_pkg	Mon Jul  1 10:02:45 2002
-@@ -18,7 +18,7 @@ _bsd_pkg_pkgfiles() {
-   paths=( "${(@)${(@s.:.)PKG_PATH}:#}" )
-   _files "$@" -g \*.tgz && ret=0
-   (( $#path )) && _files "$@" -W paths -g \*.tgz && ret=0
--  compadd "$@" - $pkgsdir/*.tgz && ret=0
-+  compadd "$@" - $pkgsdir/$(arch -s)/All/*.tgz && ret=0
+$OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.2 2003/05/23 14:21:05 lebel Exp $
+--- Completion/BSD/Command/_bsd_pkg.orig	Tue Oct 15 13:59:37 2002
++++ Completion/BSD/Command/_bsd_pkg	Fri May 23 10:13:59 2003
+@@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
  
-   return ret
+   case $OSTYPE in
+   netbsd*)
+-    portsdir=/usr/pkgsrc
++    portsdir=${PORTSDIR:-/usr/pkgsrc}
++    pkgsdir=${PACKAGES:-$portsdir/packages}/All
++    ;;
++  openbsd*)
++    portsdir=${PORTSDIR:-/usr/ports}
++    pkgsdir=${PACKAGES:-$portsdir/packages}/$(arch -s)/All
+     ;;
+   *)
+     portsdir=${PORTSDIR:-/usr/ports}
++    pkgsdir=${PACKAGES:-$portsdir/packages}/All
+     ;;
+   esac
+ 
+-  pkgsdir=${PACKAGES:-$portsdir/packages}/All
+-
+   paths=( "${(@)${(@s.:.)PKG_PATH}:#}" )
+   _files "$@" -g '*.t[bg]z' && ret=0
+   (( $#path )) && _files "$@" -W paths -g '*.t[bg]z' && ret=0
+@@ -25,7 +29,7 @@ _bsd_pkg_pkgfiles() {
+ 
+ (( $+functions[_bsd_pkg_pkgs] )) ||
+ _bsd_pkg_pkgs() {
+-  compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t)
++  compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(-/:t)
+ }
+ 
+ (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
+@@ -48,11 +52,11 @@ _bsd_pkg() {
+   pkg_add)
+     flags=(
+       '-f[force installation]'
+-      '-I[don'\''t execute installation scripts]'
++      '-I[don''t execute installation scripts]'
+       '-M[run in master mode]'
+-      '-n[don'\''t really install packages]'
++      '-n[don''t really install packages]'
+       '-p[specify prefix]:prefix directory:_files -/'
+-      '-R[don'\''t record]'
++      '-R[don''t record]'
+       '-S[run in slave mode]'
+       '-t[specify mktemp template]:mktemp template:_files -/'
+       '-v[be verbose]'
+@@ -67,9 +71,9 @@ _bsd_pkg() {
+       ;;
+     netbsd*)
+       flags=(
+-	$flags[@]
+-	'-u[update]'
+-	'-V[show version and exit]'
++        $flags[@]
++        '-u[update]'
++        '-V[show version and exit]'
+       )
+       ;;
+     esac
+@@ -83,37 +87,37 @@ _bsd_pkg() {
+     case "$OSTYPE" in
+     freebsd*)
+       flags=(
+-	'-f[specify plist file]:plist file:_files'
+-	'(-b)-c[specify comment file]:comment file:_files'
+-	'(-b)-d[specify descr file]:descr file:_files'
+-	'-Y[assume YES for any questions asked]'
+-	'-N[assume NO for any questions asked]'
+-	'(-b)-O[packing list only mode]'
+-	'-v[be verbose]'
+-	'-h[force tar to follow symlinks]'
+-	'(-b)-i[specify pre-install script]:pre-install script:_files'
+-	'(-b)-I[specify post-install script]:post-install script:_files'
+-	'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
+-	'(-b)-p[specify prefix]:prefix directory:_files -/'
+-	'(-b)-k[specify deinstall script]:deinstall script:_files'
+-	'(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
+-	'(-b)-r[specify req script]:req script:_files'
+-	'(-b)-s[specify source directory]:source directory:_files -/'
+-	'(-b)-t[specify mktemp template]:mktemp template:_files'
+-	'(-b)-X[specify exclude file]:exclude file for tar:_files'
+-	'(-b)-D[specify message file]:message file:_files'
+-	'(-b)-m[specify mtree file]:mtree file:_files'
+-	'(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
+-	'-j[use bzip2]'
+-	'-z[use gzip]'
+-	'(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify pkgname]:pkgname:_bsd_pkg_pkgs'
+-	'*:package file name:_files'
++        '-f[specify plist file]:plist file:_files'
++        '(-b)-c[specify comment file]:comment file:_files'
++        '(-b)-d[specify descr file]:descr file:_files'
++        '-Y[assume YES for any questions asked]'
++        '-N[assume NO for any questions asked]'
++        '(-b)-O[packing list only mode]'
++        '-v[be verbose]'
++        '-h[force tar to follow symlinks]'
++        '(-b)-i[specify pre-install script]:pre-install script:_files'
++        '(-b)-I[specify post-install script]:post-install script:_files'
++        '(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
++        '(-b)-p[specify prefix]:prefix directory:_files -/'
++        '(-b)-k[specify deinstall script]:deinstall script:_files'
++        '(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
++        '(-b)-r[specify req script]:req script:_files'
++        '(-b)-s[specify source directory]:source directory:_files -/'
++        '(-b)-t[specify mktemp template]:mktemp template:_files'
++        '(-b)-X[specify exclude file]:exclude file for tar:_files'
++        '(-b)-D[specify message file]:message file:_files'
++        '(-b)-m[specify mtree file]:mtree file:_files'
++        '(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
++        '-j[use bzip2]'
++        '-z[use gzip]'
++        '(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify pkgname]:pkgname:_bsd_pkg_pkgs'
++        '*:package file name:_files'
+       )
+       ;;
+     netbsd*)
+       # NetBSD users, improve me!
+       flags=(
+-	'*:package name:_bsd_pkg_pkgs'
++        '*:package name:_bsd_pkg_pkgs'
+       )
+       ;;
+     esac
+@@ -124,10 +128,10 @@ _bsd_pkg() {
+ 
+   pkg_delete)
+     flags=(
+-      '-D[don'\''t execute deinstallation scripts]'
++      '-D[don''t execute deinstallation scripts]'
+       '-d[remove empty directories]'
+       '-f[force deinstallation]'
+-      '-n[don'\''t really deinstall packages]'
++      '-n[don''t really deinstall packages]'
+       '-p[specify prefix]:prefix directory:_files -/'
+       '-v[be verbose]'
+     )
+@@ -136,35 +140,43 @@ _bsd_pkg() {
+     freebsd*)
+       flags=(
+         $flags[@]
+-	'(:)-a[delete all installed packages]'
++        '(:)-a[delete all installed packages]'
+         '-G[do not expand glob patterns]'
+-	'-i[be interactive]'
++        '-i[be interactive]'
+         '-r[delete recursively]'
+         '-x[use regular expression]'
+       )
+       ;;
+     netbsd*)
+       flags=(
+-	$flags[@]
+-	'(:)-a[delete all installed packages]'
+-	'-F[specify each package by an installed file]'
+-	'-i[be interactive]'
+-	'-O[only delete the package'\''s entries]'
++        $flags[@]
++        '(:)-a[delete all installed packages]'
++        '-F[specify each package by an installed file]'
++        '-i[be interactive]'
++        '-O[only delete the package''s entries]'
+         '-R[delete upward recursively]'
+         '-r[delete recursively]'
+-	'-V[show version and exit]'
++        '-V[show version and exit]'
+       )
+       ;;
+     esac
+ 
+-    _arguments -s \
+-      $flags[@] \
+-      '(-a)*:package name:_bsd_pkg_pkgs_and_files'
++    case "$OSTYPE" in
++    openbsd*)
++      _arguments -s \
++        $flags[@] \
++        '*:installed package name:_bsd_pkg_pkgs'
++      ;;
++    *)
++      _arguments -s \
++        $flags[@] \
++        '(-a)*:package name:_bsd_pkg_pkgs_and_files'
++      ;;
++    esac
+     ;;
+ 
+   pkg_info)
+     flags=(
+-      '(:)-a[show all installed packages]'
+       '-c[show comment fields]'
+       '-D[show install-message files]'
+       '-d[show long descriptions]'
+@@ -188,30 +200,41 @@ _bsd_pkg() {
+       flags=(
+         $flags[@]
+         '-G[do not expand glob patterns]'
+-	'-g[show files that'\''s modified]'
+-	'-o[show origin]'
+-	'-s[show total size occupied by each package]'
+-	'-t[specify mktemp template]:mktemp template:_files -/'
+-	'*-W[show which package the file belongs to]:file:_files'
+-	'-x[use regular expression]'
++        '-g[show files that are modified]'
++        '-o[show origin]'
++        '-s[show total size occupied by each package]'
++        '-t[specify mktemp template]:mktemp template:_files -/'
++        '*-W[show which package the file belongs to]:file:_files'
++        '-x[use regular expression]'
+       )
+       ;;
+     netbsd*)
+       flags=(
+-	$flags[@]
+-	'-B[show build information]'
+-	'-b[show RCS Id strings]'
+-	'-F[specify each package by an installed file]'
+-	'-S[show total size occupied by each package and its dependents]'
+-	'-s[show total size occupied by each package]'
+-	'-V[show version and exit]'
++        $flags[@]
++        '-B[show build information]'
++        '-b[show RCS Id strings]'
++        '-F[specify each package by an installed file]'
++        '-S[show total size occupied by each package and its dependents]'
++        '-s[show total size occupied by each package]'
++        '-V[show version and exit]'
+       )
+       ;;
+     esac
+ 
+-    _arguments -s \
+-      $flags[@] \
+-      '(-a)*:package name:_bsd_pkg_pkgs_and_files'
++    case "$OSTYPE" in
++    openbsd*)
++      _arguments -s \
++        '(* -)-a[show all installed packages]' \
++        $flags[@] \
++        '*:installed package name:_bsd_pkg_pkgs'
++      ;;
++    *)
++      _arguments -s \
++        '(:)-a[show all installed packages]' \
++        $flags[@] \
++        '(-a)*:package name:_bsd_pkg_pkgs_and_files'
++      ;;
++    esac
+     ;;
+   esac
  }
diff --git a/shells/zsh/snapshot/patches/patch-Doc_Makefile_in b/shells/zsh/snapshot/patches/patch-Doc_Makefile_in
index e90d988329f..1f71a3e2fc7 100644
--- a/shells/zsh/snapshot/patches/patch-Doc_Makefile_in
+++ b/shells/zsh/snapshot/patches/patch-Doc_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Doc_Makefile_in,v 1.3 2002/07/01 15:34:04 lebel Exp $
---- Doc/Makefile.in.orig	Mon Jun 17 09:17:01 2002
-+++ Doc/Makefile.in	Mon Jul  1 10:00:35 2002
+$OpenBSD: patch-Doc_Makefile_in,v 1.4 2003/05/23 14:21:05 lebel Exp $
+--- Doc/Makefile.in.orig	Thu Feb 13 06:06:46 2003
++++ Doc/Makefile.in	Thu May 22 10:01:03 2003
 @@ -37,7 +37,7 @@ INSTALL         = @INSTALL@
  
  @DEFS_MK@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Doc_Makefile_in,v 1.3 2002/07/01 15:34:04 lebel Exp $
  TEXI2DVI = texi2dvi
  DVIPS = dvips
  TEXI2HTML = texi2html -expand info -split chapter
-@@ -98,6 +98,7 @@ info: zsh.info
+@@ -99,6 +99,7 @@ info: zsh.info
  .PHONY: info
  
  zsh.info: $(sdir)/zsh.texi
@@ -18,7 +18,7 @@ $OpenBSD: patch-Doc_Makefile_in,v 1.3 2002/07/01 15:34:04 lebel Exp $
  	$(MAKEINFO) $(sdir)/zsh.texi
  
  .yo.1:
-@@ -242,11 +243,11 @@ Zsh/manmodmenu.yo: $(MODDOCSRC)
+@@ -245,11 +246,11 @@ Zsh/manmodmenu.yo: $(MODDOCSRC)
  # ========== DEPENDENCIES FOR INSTALLING ==========
  
  # install just installs the manual pages
diff --git a/shells/zsh/snapshot/patches/patch-Doc_zsh_texi b/shells/zsh/snapshot/patches/patch-Doc_zsh_texi
index 9d1d9ccd424..436f41948d0 100644
--- a/shells/zsh/snapshot/patches/patch-Doc_zsh_texi
+++ b/shells/zsh/snapshot/patches/patch-Doc_zsh_texi
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
---- Doc/zsh.texi.orig	Mon Jun 17 09:39:51 2002
-+++ Doc/zsh.texi	Mon Jul  1 10:00:36 2002
+$OpenBSD: patch-Doc_zsh_texi,v 1.4 2003/05/23 14:21:05 lebel Exp $
+--- Doc/zsh.texi.orig	Tue May  6 11:50:40 2003
++++ Doc/zsh.texi	Thu May 22 10:01:06 2003
 @@ -7,6 +7,10 @@
  @end iftex
  @setfilename zsh.info
@@ -12,7 +12,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  @c %**end of header
  
  @ifinfo
-@@ -2910,7 +2914,7 @@ you may see in your prompt (see
+@@ -2959,7 +2963,7 @@ you may see in your prompt (see
  A history expansion begins with the first character of the @t{histchars}
  parameter, which is `@t{!}' by default, and may occur anywhere on the
  command line; history expansions do not nest.  The `@t{!}' can be escaped
@@ -21,7 +21,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  to suppress its special meaning.  Double quotes will @emph{not} work for
  this.  Following this history character is an optional event designator
  (@ref{Event Designators}) and then an optional word
-@@ -6974,7 +6978,7 @@ For example,
+@@ -7076,7 +7080,7 @@ For example,
  @example
  unsetopt localtraps
  trap - INT
@@ -30,7 +30,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  @end example
  
  @noindent
-@@ -7214,7 +7218,8 @@ Array expansions of the form
+@@ -7316,7 +7320,8 @@ Array expansions of the form
  @cindex rc, quoting style
  @cindex quoting style, rc
  @item @t{RC_QUOTES}
@@ -40,7 +40,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  within singly quoted strings.  Note this does not apply in quoted strings
  using the format @t{$'}@var{...}@t{'}, where a backslashed single quote can
  be used.
-@@ -10994,7 +10999,7 @@ An interrupt character will not be inser
+@@ -11219,7 +11224,7 @@ An interrupt character will not be inser
  @item @t{quote-line} (ESC-') (unbound) (unbound)
  Quote the current line; that is, put a `@t{'}' character at the
  beginning and the end, and convert all `@t{'}' characters
@@ -49,7 +49,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  
  @tindex quote-region
  @item @t{quote-region} (ESC-") (unbound) (unbound)
-@@ -14099,7 +14104,7 @@ different types of matches displayed sep
+@@ -14515,7 +14520,7 @@ different types of matches displayed sep
  
  @noindent
  @example
@@ -58,7 +58,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  @end example
  
  @noindent
-@@ -14371,7 +14376,7 @@ zstyle ':completion:*:default' list-colo
+@@ -14783,7 +14788,7 @@ zstyle ':completion:*:default' list-colo
  
  @noindent
  The default colors are the same as for the GNU @t{ls} command and can be
@@ -67,7 +67,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  
  @kindex list-grouped, completion style
  @item @t{list-grouped}
-@@ -14478,7 +14483,7 @@ completion one would do:
+@@ -14903,7 +14908,7 @@ generates no matches, case-insensitive c
  
  @noindent
  @example
@@ -76,7 +76,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  @end example
  
  @noindent
-@@ -14503,7 +14508,7 @@ the @t{_complete} completer, one would d
+@@ -14927,7 +14932,7 @@ case-insensitive completion with @t{_com
  @example
  zstyle ':completion:*' completer _complete _prefix
  zstyle ':completion:*:complete:*' matcher-list \ 
@@ -85,7 +85,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  @end example
  
  @noindent
-@@ -14521,7 +14526,7 @@ match specifications for each occurrence
+@@ -14942,7 +14947,7 @@ partial-word completion:
  @example
  zstyle ':completion:*' completer _complete _correct _complete:foo
  zstyle ':completion:*:complete:*' matcher-list \ 
@@ -94,7 +94,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  zstyle ':completion:*:foo:*' matcher-list \ 
      'm:@{a-zA-Z@}=@{A-Za-z@} r:|[-_./]=* r:|=*'
  @end example
-@@ -17648,7 +17653,7 @@ generates at least one match. E.g.:
+@@ -18055,7 +18060,7 @@ generates at least one match. E.g.:
  
  @noindent
  @example
@@ -103,7 +103,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  @end example
  
  @noindent
-@@ -17860,7 +17865,7 @@ use is
+@@ -18267,7 +18272,7 @@ use is
  
  @noindent
  @example
@@ -112,7 +112,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.3 2002/07/01 15:34:04 lebel Exp $
  @end example
  
  @noindent
-@@ -17948,7 +17953,7 @@ performed on the first word in the range
+@@ -18355,7 +18360,7 @@ performed on the first word in the range
  
  @noindent
  @example
diff --git a/shells/zsh/snapshot/pkg/PLIST b/shells/zsh/snapshot/pkg/PLIST
index a4c9cabaaf7..79beae96aaf 100644
--- a/shells/zsh/snapshot/pkg/PLIST
+++ b/shells/zsh/snapshot/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/07/01 15:34:04 lebel Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/05/23 14:21:05 lebel Exp $
 @unexec install-info --delete --info-dir=%D/info %D/info/zsh.info
 bin/zsh
 bin/zsh-${VERSION}
@@ -18,11 +18,14 @@ man/man1/zshparam.1
 man/man1/zshzle.1
 !%%static%%
 share/zsh/${VERSION}/functions/_a2ps
+share/zsh/${VERSION}/functions/_acroread
 share/zsh/${VERSION}/functions/_alias
 share/zsh/${VERSION}/functions/_aliases
 share/zsh/${VERSION}/functions/_all_labels
 share/zsh/${VERSION}/functions/_all_matches
 share/zsh/${VERSION}/functions/_alternative
+share/zsh/${VERSION}/functions/_ant
+share/zsh/${VERSION}/functions/_antiword
 share/zsh/${VERSION}/functions/_apachectl
 share/zsh/${VERSION}/functions/_apm
 share/zsh/${VERSION}/functions/_approximate
@@ -34,6 +37,8 @@ share/zsh/${VERSION}/functions/_arguments
 share/zsh/${VERSION}/functions/_arp
 share/zsh/${VERSION}/functions/_arping
 share/zsh/${VERSION}/functions/_arrays
+share/zsh/${VERSION}/functions/_assign
+share/zsh/${VERSION}/functions/_auto-apt
 share/zsh/${VERSION}/functions/_autocd
 share/zsh/${VERSION}/functions/_autoload
 share/zsh/${VERSION}/functions/_bash_completions
@@ -70,6 +75,12 @@ share/zsh/${VERSION}/functions/_correct_word
 share/zsh/${VERSION}/functions/_cpio
 share/zsh/${VERSION}/functions/_cvs
 share/zsh/${VERSION}/functions/_cvsup
+share/zsh/${VERSION}/functions/_cygcheck
+share/zsh/${VERSION}/functions/_cygpath
+share/zsh/${VERSION}/functions/_cygrunsrv
+share/zsh/${VERSION}/functions/_cygserver
+share/zsh/${VERSION}/functions/_cygstart
+share/zsh/${VERSION}/functions/_dcop
 share/zsh/${VERSION}/functions/_dd
 share/zsh/${VERSION}/functions/_deb_packages
 share/zsh/${VERSION}/functions/_debchange
@@ -91,11 +102,14 @@ share/zsh/${VERSION}/functions/_domains
 share/zsh/${VERSION}/functions/_dpkg
 share/zsh/${VERSION}/functions/_dpkg_source
 share/zsh/${VERSION}/functions/_dput
+share/zsh/${VERSION}/functions/_dumper
 share/zsh/${VERSION}/functions/_dupload
 share/zsh/${VERSION}/functions/_dvi
 share/zsh/${VERSION}/functions/_echotc
 share/zsh/${VERSION}/functions/_echoti
+share/zsh/${VERSION}/functions/_elinks
 share/zsh/${VERSION}/functions/_elm
+share/zsh/${VERSION}/functions/_email_addresses
 share/zsh/${VERSION}/functions/_emulate
 share/zsh/${VERSION}/functions/_enable
 share/zsh/${VERSION}/functions/_enscript
@@ -120,9 +134,14 @@ share/zsh/${VERSION}/functions/_functions
 share/zsh/${VERSION}/functions/_gcc
 share/zsh/${VERSION}/functions/_gdb
 share/zsh/${VERSION}/functions/_generic
+share/zsh/${VERSION}/functions/_getclip
 share/zsh/${VERSION}/functions/_getconf
+share/zsh/${VERSION}/functions/_getfacl
+share/zsh/${VERSION}/functions/_global
+share/zsh/${VERSION}/functions/_global_tags
 share/zsh/${VERSION}/functions/_gnu_generic
 share/zsh/${VERSION}/functions/_gprof
+share/zsh/${VERSION}/functions/_gqview
 share/zsh/${VERSION}/functions/_grep
 share/zsh/${VERSION}/functions/_groups
 share/zsh/${VERSION}/functions/_gs
@@ -161,11 +180,13 @@ share/zsh/${VERSION}/functions/_loadkeys
 share/zsh/${VERSION}/functions/_locales
 share/zsh/${VERSION}/functions/_logical_volumes
 share/zsh/${VERSION}/functions/_look
+share/zsh/${VERSION}/functions/_losetup
 share/zsh/${VERSION}/functions/_lp
 share/zsh/${VERSION}/functions/_ls
 share/zsh/${VERSION}/functions/_lscfg
 share/zsh/${VERSION}/functions/_lsdev
 share/zsh/${VERSION}/functions/_lslv
+share/zsh/${VERSION}/functions/_lsof
 share/zsh/${VERSION}/functions/_lspv
 share/zsh/${VERSION}/functions/_lsvg
 share/zsh/${VERSION}/functions/_lynx
@@ -182,11 +203,14 @@ share/zsh/${VERSION}/functions/_menu
 share/zsh/${VERSION}/functions/_mere
 share/zsh/${VERSION}/functions/_message
 share/zsh/${VERSION}/functions/_mh
+share/zsh/${VERSION}/functions/_mkshortcut
+share/zsh/${VERSION}/functions/_mkzsh
 share/zsh/${VERSION}/functions/_modutils
 share/zsh/${VERSION}/functions/_mondo
 share/zsh/${VERSION}/functions/_most_recent_file
 share/zsh/${VERSION}/functions/_mount
 share/zsh/${VERSION}/functions/_mozilla
+share/zsh/${VERSION}/functions/_mt
 share/zsh/${VERSION}/functions/_mtools
 share/zsh/${VERSION}/functions/_multi_parts
 share/zsh/${VERSION}/functions/_mutt
@@ -217,6 +241,7 @@ share/zsh/${VERSION}/functions/_patch
 share/zsh/${VERSION}/functions/_path_files
 share/zsh/${VERSION}/functions/_pbm
 share/zsh/${VERSION}/functions/_pdf
+share/zsh/${VERSION}/functions/_perforce
 share/zsh/${VERSION}/functions/_perl
 share/zsh/${VERSION}/functions/_perl_basepods
 share/zsh/${VERSION}/functions/_perl_builtin_funcs
@@ -234,13 +259,17 @@ share/zsh/${VERSION}/functions/_print
 share/zsh/${VERSION}/functions/_printers
 share/zsh/${VERSION}/functions/_prompt
 share/zsh/${VERSION}/functions/_ps
+share/zsh/${VERSION}/functions/_pscp
 share/zsh/${VERSION}/functions/_pspdf
 share/zsh/${VERSION}/functions/_psutils
+share/zsh/${VERSION}/functions/_putclip
+share/zsh/${VERSION}/functions/_python
 share/zsh/${VERSION}/functions/_rcs
 share/zsh/${VERSION}/functions/_read
 share/zsh/${VERSION}/functions/_read_comp
 share/zsh/${VERSION}/functions/_redirect
 share/zsh/${VERSION}/functions/_regex_arguments
+share/zsh/${VERSION}/functions/_renice
 share/zsh/${VERSION}/functions/_requested
 share/zsh/${VERSION}/functions/_retrieve_cache
 share/zsh/${VERSION}/functions/_rlogin
@@ -250,6 +279,7 @@ share/zsh/${VERSION}/functions/_ruby
 share/zsh/${VERSION}/functions/_samba
 share/zsh/${VERSION}/functions/_sccs
 share/zsh/${VERSION}/functions/_sched
+share/zsh/${VERSION}/functions/_screen
 share/zsh/${VERSION}/functions/_sep_parts
 share/zsh/${VERSION}/functions/_service
 share/zsh/${VERSION}/functions/_services
@@ -282,6 +312,7 @@ share/zsh/${VERSION}/functions/_terminals
 share/zsh/${VERSION}/functions/_tex
 share/zsh/${VERSION}/functions/_texi
 share/zsh/${VERSION}/functions/_texinfo
+share/zsh/${VERSION}/functions/_tidy
 share/zsh/${VERSION}/functions/_tiff
 share/zsh/${VERSION}/functions/_tilde
 share/zsh/${VERSION}/functions/_tilde_files
@@ -291,6 +322,7 @@ share/zsh/${VERSION}/functions/_trap
 share/zsh/${VERSION}/functions/_ttyctl
 share/zsh/${VERSION}/functions/_typeset
 share/zsh/${VERSION}/functions/_ulimit
+share/zsh/${VERSION}/functions/_uml
 share/zsh/${VERSION}/functions/_unhash
 share/zsh/${VERSION}/functions/_unsetopt
 share/zsh/${VERSION}/functions/_update-alternatives
@@ -339,8 +371,8 @@ share/zsh/${VERSION}/functions/_xauth
 share/zsh/${VERSION}/functions/_xdvi
 share/zsh/${VERSION}/functions/_xfig
 share/zsh/${VERSION}/functions/_xloadimage
+share/zsh/${VERSION}/functions/_xmlsoft
 share/zsh/${VERSION}/functions/_xmodmap
-share/zsh/${VERSION}/functions/_xrdb
 share/zsh/${VERSION}/functions/_xset
 share/zsh/${VERSION}/functions/_xt_arguments
 share/zsh/${VERSION}/functions/_xt_session_id
@@ -353,19 +385,18 @@ share/zsh/${VERSION}/functions/_zcat
 share/zsh/${VERSION}/functions/_zcompile
 share/zsh/${VERSION}/functions/_zdump
 share/zsh/${VERSION}/functions/_zed
+share/zsh/${VERSION}/functions/_zftp
 share/zsh/${VERSION}/functions/_zip
 share/zsh/${VERSION}/functions/_zle
 share/zsh/${VERSION}/functions/_zmodload
+share/zsh/${VERSION}/functions/_zmv
 share/zsh/${VERSION}/functions/_zpty
 share/zsh/${VERSION}/functions/_zstyle
 share/zsh/${VERSION}/functions/allopt
-share/zsh/${VERSION}/functions/bash-backward-kill-word
-share/zsh/${VERSION}/functions/bash-backward-word
-share/zsh/${VERSION}/functions/bash-down-case-word
-share/zsh/${VERSION}/functions/bash-forward-word
-share/zsh/${VERSION}/functions/bash-kill-word
-share/zsh/${VERSION}/functions/bash-transpose-words
-share/zsh/${VERSION}/functions/bash-up-case-word
+share/zsh/${VERSION}/functions/backward-kill-word-match
+share/zsh/${VERSION}/functions/backward-word-match
+share/zsh/${VERSION}/functions/bashcompinit
+share/zsh/${VERSION}/functions/capitalize-word-match
 share/zsh/${VERSION}/functions/checkmail
 share/zsh/${VERSION}/functions/colors
 share/zsh/${VERSION}/functions/compaudit
@@ -374,8 +405,10 @@ share/zsh/${VERSION}/functions/compinit
 share/zsh/${VERSION}/functions/compinstall
 share/zsh/${VERSION}/functions/copy-earlier-word
 share/zsh/${VERSION}/functions/cycle-completion-positions
+share/zsh/${VERSION}/functions/down-case-word-match
 share/zsh/${VERSION}/functions/down-line-or-beginning-search
 share/zsh/${VERSION}/functions/edit-command-line
+share/zsh/${VERSION}/functions/forward-word-match
 share/zsh/${VERSION}/functions/getjobs
 share/zsh/${VERSION}/functions/harden
 share/zsh/${VERSION}/functions/history-search-end
@@ -383,7 +416,11 @@ share/zsh/${VERSION}/functions/incarg
 share/zsh/${VERSION}/functions/incremental-complete-word
 share/zsh/${VERSION}/functions/insert-files
 share/zsh/${VERSION}/functions/is-at-least
+share/zsh/${VERSION}/functions/kill-word-match
+share/zsh/${VERSION}/functions/match-words-by-style
 share/zsh/${VERSION}/functions/mere
+share/zsh/${VERSION}/functions/narrow-to-region
+share/zsh/${VERSION}/functions/narrow-to-region-invisible
 share/zsh/${VERSION}/functions/nslookup
 share/zsh/${VERSION}/functions/predict-on
 share/zsh/${VERSION}/functions/prompt_adam1_setup
@@ -403,11 +440,17 @@ share/zsh/${VERSION}/functions/prompt_walters_setup
 share/zsh/${VERSION}/functions/prompt_zefram_setup
 share/zsh/${VERSION}/functions/promptinit
 share/zsh/${VERSION}/functions/promptnl
+share/zsh/${VERSION}/functions/read-from-minibuffer
 share/zsh/${VERSION}/functions/relative
+share/zsh/${VERSION}/functions/replace-string
 share/zsh/${VERSION}/functions/run-help
+share/zsh/${VERSION}/functions/select-word-style
 share/zsh/${VERSION}/functions/smart-insert-last-word
 share/zsh/${VERSION}/functions/tetris
+share/zsh/${VERSION}/functions/transpose-words-match
+share/zsh/${VERSION}/functions/up-case-word-match
 share/zsh/${VERSION}/functions/up-line-or-beginning-search
+share/zsh/${VERSION}/functions/zargs
 share/zsh/${VERSION}/functions/zcalc
 share/zsh/${VERSION}/functions/zed
 share/zsh/${VERSION}/functions/zkbd