diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 20ffdb48ad3a..fc2e404367ed 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,151 +1,150 @@
 # New ports collection makefile for:	zsh
 # Date created:			11 Feb. 1995
 # Whom:				torstenb
 #
 # $FreeBSD$
 #
 
 # The following compile-time options are available:
 # NO_SHARED=yes		compile a static version of zsh
 #			(default: use dynamically loadable modules)
 # ZSH_ETCDIR=<dir>	directory for zsh system-wide configuration files:
 #			zshenv, zlogin, zprofile, zshrc, zlogout.
 #			e.g. use this to put config files inside ${PREFIX}
 #			(default: /etc)
 #			NOTE: does NOT have to be inside ${PREFIX} tree
 # ZSH_FNDIR=<dir>	directory for zsh functions (part of distribution)
 #			(default: ${PREFIX}/share/zsh/${ZSH_VER}/functions)
 #			NOTE: should be inside ${PREFIX} tree
 # ZSH_SITEFNDIR=<dir>	directory for zsh site functions (locally developed)
 #			(default: ${PREFIX}/share/zsh/site-functions)
 #			NOTE: does NOT have to be inside ${PREFIX} tree
 
 PORTNAME=	zsh
-PORTVERSION=	4.3.6
-PORTREVISION=	8
+PORTVERSION=	4.3.9
 CATEGORIES=	shells
 MASTER_SITES=	SF
 .if !defined(NOPORTDOCS)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-doc${EXTRACT_SUFX}
 .endif
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	The Z shell
 
 ZSH_VER=	${PORTVERSION}
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_AUTOTOOLS=	autoconf:262 autoheader:262
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-term-lib="ncursesw ncurses" --with-tcsetpgrp \
 		--enable-etcdir=${ZSH_ETCDIR} \
 		--enable-fndir=${ZSH_FNDIR} --enable-function-subdirs \
 		--enable-site-fndir=${ZSH_SITEFNDIR}
 
 OPTIONS=	ZSH_MEM		"Enable zsh-mem and zsh-secure-free options" on \
 		ZSH_MAILDIR	"Enable support for Maildirs in MAIL(PATH)" on \
 		ZSH_MULTIBYTE	"Enable multibyte character support" on \
 		ZSH_PCRE	"Enable PCRE support" off
 
 # These variables can be overriden by user
 ZSH_ETCDIR?=	/etc
 ZSH_FNDIR?=	${DATADIR}/${ZSH_VER}/functions
 ZSH_SITEFNDIR?=	${DATADIR}/site-functions
 
 PLIST_SUB+=	ZSH_VER="${ZSH_VER}" ZSHETCDIR="${ZSH_ETCDIR}" \
 		ZSH_FNDIR="${ZSH_FNDIR:S!${PREFIX}/!!}" \
 		ZSH_SITEFNDIR="${ZSH_SITEFNDIR}"
 
 MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshcompwid.1 zshcompsys.1 \
 		zshcontrib.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 \
 		zshparam.1 zshroadmap.1 zshtcpsys.1 zshzftpsys.1 zshzle.1 \
 		zshall.1 zshcalsys.1
 DOCS=		LICENCE META-FAQ README Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ \
 		Etc/completion-style-guide Doc/zsh*.html Doc/zsh.dvi
 PORTDOCS=	*
 PORTEXAMPLES=	zlogin zshenv zshrc
 SHELLS=		/etc/shells
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_ZSH_PCRE)
 CONFIGURE_ARGS+=	--enable-pcre
 LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
 PLIST_SUB+=		PCRE=""
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 PLIST_SUB+=		PCRE="@comment "
 .endif
 
 .if defined(WITH_ZSH_MEM)
 CONFIGURE_ARGS+=	--enable-zsh-mem --enable-zsh-secure-free
 .endif
 
 .if defined(WITH_ZSH_MAILDIR)
 CONFIGURE_ARGS+=	--enable-maildir-support
 .endif
 
 .if defined(NO_SHARED)
 CONFIGURE_ENV=		LDFLAGS="${LDFLAGS} -static"
 CONFIGURE_ARGS+=	--disable-dynamic
 PLIST_SUB+=		NO_STATIC="@comment "
 .else
 CONFIGURE_ARGS+=	--enable-dynamic
 PLIST_SUB+=		NO_STATIC=""
 .endif
 
 .if defined(WITH_ZSH_MULTIBYTE)
 CONFIGURE_ARGS+=	--enable-multibyte
 .else
 CONFIGURE_ARGS+=	--disable-multibyte
 .endif
 
 .if ${OSVERSION} >= 503000
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-bsdtar
 .endif
 
 post-patch:
 	@${SED} -i "" -e "s,link=dynamic,link=either," \
 		${WRKSRC}/Src/Modules/*.mdd
 	@${SED} -i "" -e "s,/etc/,${LOCALBASE}/etc/," \
 		${WRKSRC}/Functions/MIME/zsh-mime-setup
 	@${FIND} ${WRKSRC}/Completion -type f -iname '*.orig' -delete
 
 post-build:
 	# Fix ".so" macro problem by using "soelim" command.
 	${LN} -sf ${WRKSRC}/Doc ${WRKSRC}/man1
 	${MV} ${WRKSRC}/Doc/zshall.1 ${WRKSRC}/Doc/zshall.1.source
 	cd ${WRKSRC} && /usr/bin/soelim ${WRKSRC}/Doc/zshall.1.source > \
 		${WRKSRC}/Doc/zshall.1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/info
 	makeinfo --no-split --output=${WRKSRC}/Doc/zsh.info \
 		${WRKSRC}/Doc/zsh.texi
 INFO=	zsh
 .endif
 
 post-install:
 	${LN} ${PREFIX}/bin/zsh ${PREFIX}/bin/rzsh
 	${TEST} -d ${ZSH_ETCDIR} || ${MKDIR} ${ZSH_ETCDIR}
 	${TEST} -d ${ZSH_SITEFNDIR} || ${MKDIR} ${ZSH_SITEFNDIR}
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info/zsh.info
 .endif
 	@${ECHO_MSG} "Updating ${SHELLS}"
 	@${CP} ${SHELLS} ${SHELLS}.bak
 	@(${GREP} -v ${PREFIX}/bin/zsh ${SHELLS}.bak; \
 	  ${ECHO_CMD} ${PREFIX}/bin/zsh) > ${SHELLS}
 	@${RM} ${SHELLS}.bak
 
 .include <bsd.port.post.mk>
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 13303fa4b0f9..29eeffd37215 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,6 +1,6 @@
-MD5 (zsh-4.3.6.tar.bz2) = 16f399af1081ad3c303a794c9c7dc47e
-SHA256 (zsh-4.3.6.tar.bz2) = 5a253d107533ff60ab9edb74de9425f2ca93bc5a3ddb5c1b5bfd488a794dc873
-SIZE (zsh-4.3.6.tar.bz2) = 2527972
-MD5 (zsh-4.3.6-doc.tar.bz2) = cab29228a90f58b1431a66ab24a0a0c2
-SHA256 (zsh-4.3.6-doc.tar.bz2) = a82cf4e55d6bcf1ea40c23ef5f99002d504c441a8f6d14af0ed4d574c6ffbcc6
-SIZE (zsh-4.3.6-doc.tar.bz2) = 2473544
+MD5 (zsh-4.3.9.tar.bz2) = 0539d0a590e545ad8c40ff8c97e94538
+SHA256 (zsh-4.3.9.tar.bz2) = 8fdd6d6c6dc3a061b0c9a1b26eb367d10c0d8094d4b8bd2613740fc40b4382ab
+SIZE (zsh-4.3.9.tar.bz2) = 2659602
+MD5 (zsh-4.3.9-doc.tar.bz2) = b3a026cf02471b66454a2b241a4d92a4
+SHA256 (zsh-4.3.9-doc.tar.bz2) = 15ae762a228c2b2d410cecdddca279e49dfa6cfff85aaf8fa55e74940b4e8165
+SIZE (zsh-4.3.9-doc.tar.bz2) = 2570995
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_csup b/shells/zsh/files/patch-Completion-BSD-Command-_csup
deleted file mode 100644
index 3e7c567653c2..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_csup
+++ /dev/null
@@ -1,30 +0,0 @@
---- Completion/BSD/Command/_csup.orig	2007-07-20 18:39:15.000000000 +0200
-+++ Completion/BSD/Command/_csup	2008-08-13 19:00:33.890223677 +0200
-@@ -4,17 +4,17 @@
-     '-1[disable automatic retries]' \
-     '-4[Force usage of IPv4 addresses]' \
-     '-6[Force usage of IPv6 addresses]' \
--    '-A:local address:_hosts' \
--    '-b:base directory:_files -/' \
--    '-c:collections directory:_files -/' \
--    '-d:maximum number of deleted files:' \
--    '-h:server host:_hosts' \
--    '-i:file pattern:' \
-+    '-A[Local address to bind to when connecting to the server]:local address:_hosts' \
-+    '-b[Base directory]:base directory:_files -/' \
-+    '-c[Subdirectory of base for information about collections]:collections directory:_files -/' \
-+    '-d[maximum number of deleted files]:maximum number of deleted files:' \
-+    '-h[Server host]:server host:_hosts' \
-+    '-i[Include only files and directories matching]:file pattern:' \
-     '-k[keep temporary copies of failed updates]' \
--    '-l:lock file:_files' \
--    '-L:verbosity level:(0 1 2)' \
--    '-p:port:_ports' \
--    '-r:maximum number of retries:' \
-+    '-l[Lock file]:lock file:_files' \
-+    '-L[Verbosity level]:verbosity level:(0 1 2)' \
-+    '-p[Server port]:port:_ports' \
-+    '-r[maximum number of retries]:maximum number of retries:' \
-     '-s[suppress status checks]' \
-     '-v[print version information]' \
-     '(-Z)-z[enable compression]' \
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_fetch b/shells/zsh/files/patch-Completion-BSD-Command-_fetch
deleted file mode 100644
index 121ae8c2e32f..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_fetch
+++ /dev/null
@@ -1,33 +0,0 @@
---- Completion/BSD/Command/_fetch.orig	2008-08-12 13:52:12.422331053 +0200
-+++ Completion/BSD/Command/_fetch	2008-08-07 16:33:14.000000000 +0200
-@@ -0,0 +1,30 @@
-+#compdef fetch
-+# Deprecated arguments are removed from the completion
-+
-+_arguments -s \
-+	'-1[Stop and return exit code 0 at the first successfully retrieved file]' \
-+	'-4[Forces fetch to use IPv4 addresses only]' \
-+	'-6[Forces fetch to use IPv6 addresses only]' \
-+	'-A[Do not automatically follow "temporary" (302) redirects]' \
-+	'-a[Automatically retry the transfer upon soft failures]' \
-+	'-B[Specify the read buffer size in bytes]:bytes:' \
-+	'-d[Use a direct connection even if a proxy is configured]' \
-+	'-F[In combination with the -r flag, forces a restart]' \
-+	'-l[If the target is a file-scheme URL, make a symbolic link to the target]' \
-+	'-M' \
-+	'-m[Mirror mode]' \
-+	'-N[Use file instead of ~/.netrc to look up login names and pass- words for FTP sites]' \
-+	'-n[Do not preserve the modification time]' \
-+	'-o[Set the output file name]:file:_files' \
-+	'-P' \
-+	'-p[Use passive FTP]' \
-+	'-q[Quiet mode]' \
-+	'-R[Do not delete the output file in any circumstances]' \
-+	'-r[Restart a previously interrupted transfer]' \
-+	'-S[Require the file size reported by the server to match the specified value]' \
-+	'-s[Print the size in bytes, without fetching it]' \
-+	'-T[Set timeout value]:seconds:' \
-+	'-U[When using passive FTP, allocate the port for the data connection from the low port range]' \
-+	'-v[Increase verbosity level]' \
-+	'-w[wait successive retries]:seconds:' \
-+	'*:URL to fetch:_urls'
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_freebsd-update b/shells/zsh/files/patch-Completion-BSD-Command-_freebsd-update
deleted file mode 100644
index 5efee38c5fe3..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_freebsd-update
+++ /dev/null
@@ -1,23 +0,0 @@
---- Completion/BSD/Command/_freebsd-update.orig	2008-08-12 13:52:12.415323508 +0200
-+++ Completion/BSD/Command/_freebsd-update	2008-08-07 23:17:13.000000000 +0200
-@@ -0,0 +1,20 @@
-+#compdef freebsd-update
-+
-+local flags
-+flags=(
-+  '(cron)fetch[Fetch a compressed snapshot or update existing one]'
-+  '(fetch)cron[Sleep rand(3600) seconds, and then fetch updates]'
-+  '(install rollback)upgrade[Fetch files necessary for upgrading to a new release]'
-+  '(upgrade rollback)install[Install the most recently fetched updates or upgrade]'
-+  '(upgrade install)rollback[Uninstall the most recently installed updates]'
-+)
-+
-+_arguments -s \
-+  '-b[Operate on a system mounted at basedir]:basedir:_files -/' \
-+  '-d[Store working files in workdir]:workdir:_files -/' \
-+  '-f[Read configuration options from conffile]:conf file:_files' \
-+  '-k[Trust an RSA key with SHA256 of KEY]:RSA key:' \
-+  '-r[Specify the new release]:new release:' \
-+  '-s[Fetch files from the specified server or server pool]:server:_hosts' \
-+  '-f[Mail output of cron command, if any, to address]:address:' \
-+  ':command:_values -S " " -w "commands" $flags[@]'
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_portlint b/shells/zsh/files/patch-Completion-BSD-Command-_portlint
deleted file mode 100644
index 332194784b8b..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_portlint
+++ /dev/null
@@ -1,11 +0,0 @@
---- Completion/BSD/Command/_portlint.orig	2007-07-20 18:39:15.000000000 +0200
-+++ Completion/BSD/Command/_portlint	2008-08-13 19:00:33.915251533 +0200
-@@ -12,6 +12,6 @@
-     '-t[nit pick about use of spaces]' \
-     '-N[writing a new port]' \
-     '-V[print the version and exit]' \
--    '-M:set make variables to ENV (ex. PORTSDIR=/usr/ports.work):_guard ".#" "environment vars"' \
--    '-B:allow # contiguous blank lines:_guard "[0-9]#" "numeric value"' \
-+    '-M[set make variables to ENV (ex. PORTSDIR=/usr/ports.work)]: :_guard ".#" "environment vars"' \
-+    '-B[allow # contiguous blank lines]: :_guard "[0-9]#" "numeric value"' \
-     ':port directory:_files -/'
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_portsnap b/shells/zsh/files/patch-Completion-BSD-Command-_portsnap
deleted file mode 100644
index 37eb3f62e0b1..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_portsnap
+++ /dev/null
@@ -1,22 +0,0 @@
---- Completion/BSD/Command/_portsnap.orig	2007-07-22 13:40:02.000000000 +0200
-+++ Completion/BSD/Command/_portsnap	2008-08-13 19:00:33.920251572 +0200
-@@ -11,13 +11,13 @@
- )
- 
- _arguments -C -s \
--    '-d:Store working files in workdir:_files -/' \
--    '-f:Read configuration options from conffile:_files' \
-+    '-d[Store working files in workdir]:workdir:_files -/' \
-+    '-f[Read configuration options from conffile]:conf file:_files' \
-     '-I[Update INDEX only. (update command only)]' \
--    '-k:Trust an RSA key with SHA256 hash of KEY:_files' \
--    '-l:Merge the specified local describes file into the INDEX:_files' \
--    '-p:Location of uncompressed ports tree:_files -/' \
--    '-s:Server from which to fetch updates:_hosts' \
-+    '-k[Trust an RSA key with SHA256 hash of KEY]:RSA key:_files' \
-+    '-l[Merge the specified local describes file into the INDEX]:file:_files' \
-+    '-p[Location of uncompressed ports tree]:uncompressed ports tree:_files -/' \
-+    '-s[Server from which to fetch updates]:server:_hosts' \
-     '*:principal:->principal' && ret=0
- 
- if [[ $state == principal ]]; then
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_powerd b/shells/zsh/files/patch-Completion-BSD-Command-_powerd
deleted file mode 100644
index d3c52345ce77..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_powerd
+++ /dev/null
@@ -1,16 +0,0 @@
---- Completion/BSD/Command/_powerd.orig	2008-08-12 13:52:12.426336561 +0200
-+++ Completion/BSD/Command/_powerd	2008-08-07 16:03:57.000000000 +0200
-@@ -0,0 +1,13 @@
-+#compdef powerd
-+
-+local powerd_mode
-+powerd_mode=(minimum maximum adaptative)
-+_arguments -s \
-+    "-a[Mode to use while on AC power]:mode:($powerd_mode)" \
-+    "-b[Mode to use while on battery power]:mode:($powerd_mode)" \
-+    '-i[CPU idle percent level when begin to degrade performance]:percent:' \
-+    "-n[mode to use normally when the AC line state is unknown]:mode:($powerd_mode)" \
-+    '-p[polling interval (in milliseconds) for AC line state and system idle levels]:interval:' \
-+    '-P[Alternative pidfile]:pidfile:_files' \
-+    '-r[CPU idle percent level where to increase performance]:percent:' \
-+    '-v[Verbose mode]'
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_zfs b/shells/zsh/files/patch-Completion-BSD-Command-_zfs
deleted file mode 100644
index 746ffaa713cf..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_zfs
+++ /dev/null
@@ -1,241 +0,0 @@
---- Completion/BSD/Command/_zfs.orig	2008-08-12 13:52:12.447355005 +0200
-+++ Completion/BSD/Command/_zfs	2008-08-11 21:01:43.000000000 +0200
-@@ -0,0 +1,238 @@
-+#compdef zfs
-+
-+_zfs() {
-+	local context state line expl
-+	typeset -A opt_args
-+	local -a subcmds rw_properties rw_propnames ro_properties
-+
-+	subcmds=(
-+		"create" "destroy" "clone" "promote" "rename" "snapshot"
-+		"rollback" "list" "set" "get" "inherit" "mount" "unmount"
-+		"share" "unshare" "send" "receive" "allow" "unallow"
-+		"upgrade"
-+	)
-+
-+	ro_properties=(
-+		"name" "type" "creation" "used" "available" "referenced"
-+		"compressratio" "mounted" "origin"
-+	)
-+
-+	# TODO: Be cleverer about what values can be set.  Is there any way to
-+	# set the sorting for *size properties to false by default?
-+	rw_properties=(
-+		"aclinherit:value:(discard noallow secure passthrough)"
-+		"aclmode:value:(discard groupmask passthrough)"
-+		"atime:value:(on off)"
-+		"canmount:value:(on off)"
-+		"checksum:value:(on off fletcher2 fletcher4 sha256)"
-+		"compression:value:(on off lzjb gzip gzip-{1..9})"
-+		"copies:value:(1 2 3)"
-+		"devices:value:(on off)"
-+		"exec:value:(on off)"
-+		"mountpoint:value:{if [[ -prefix /* ]]; then _path_files -/; else _wanted mountpoints expl 'mountpoint (type \"/\" to start completing paths)' compadd legacy none; fi}"
-+		"quota:number or 'none':{if [[ -prefix [0-9]## ]]; then _message -e 'number'; elif [[ $PREFIX == quota= ]]; then _wanted none expl 'number or none' compadd none; else _wanted none expl 'quota' compadd none; fi}"
-+		"readonly:value:(on off)"
-+		"recordsize:value:(512 1K 2K 4K 8K 16K 32K 64K 128K)"
-+		"reservation:value:" # <size>, "none"
-+		"setuid:value:(on off)"
-+		"shareiscsi:value:(on off)" # or "type=<type>"
-+		"sharenfs:value:(on off)" # or share(1M) options
-+		"snapdir:value:(hidden visible)"
-+		"version:value:(1 2 current)"
-+		"volblocksize:value:(512 1K 2K 4K 8K 16K 32K 64K 128K)"
-+		"volsize:value:" # <size>
-+		"xattr:value:(on off)"
-+		"zoned:value:(on off)"
-+	)
-+
-+	rw_propnames=( ${rw_properties%%:*} )
-+
-+	if [[ $service == "zfs" ]]; then
-+		_arguments -C -A "-*" \
-+			'-\?[Help]' \
-+			'*::command:->subcmd' && return 0
-+
-+		if (( CURRENT == 1 )); then
-+			_wanted commands expl "zfs subcommand" compadd -a subcmds
-+			return
-+		fi
-+		service="$words[1]"
-+		curcontext="${curcontext%:*}=$service:"
-+	fi
-+
-+	case $service in
-+	("create")
-+		_arguments -A "-*" \
-+			'-p[Create parent datasets]' \
-+			'-o[Set initial properties]:property:_values -s , "property" $rw_properties' \
-+			- set1 \
-+			':filesystem:' \
-+			- set2 \
-+			'-s[Create sparse volume]' \
-+			'-b[Set volblocksize]:blocksize:' \
-+			'-V[Set size]:size:' \
-+			':volume:'
-+		;;
-+
-+	("destroy")
-+		_arguments -A "-*" \
-+			'-r[Recursively destroy all children]' \
-+			'-R[Recursively destroy all dependents]' \
-+			'-f[Force unmounts]' \
-+			':filesystem/volume/snapshot:_zfs_dataset'
-+		;;
-+
-+	("snapshot")
-+		_arguments -A "-*" \
-+			'-r[Recursively snapshot all descendant datasets]' \
-+			':filesystem/volume:_zfs_dataset -t fs -t vol -S@'
-+		;;
-+
-+	("rollback")
-+		_arguments -A "-*" \
-+			'-r[Recursively destroy more recent snapshots]' \
-+			'-R[Recursively destroy more recent snapshots and clones]' \
-+			'-f[Force unmounts]' \
-+			':snapshot:_zfs_dataset -t snap'
-+		;;
-+
-+	("clone")
-+		# XXX needs to bail if there are no snapshots
-+		_arguments -A "-*" \
-+			'-p[Create parent datasets]' \
-+			':snapshot:_zfs_dataset -t snap' \
-+			':filesystem/volume:'
-+		;;
-+
-+	("promote")
-+		# XXX complete only cloned filesystems
-+		_arguments \
-+			':filesystem:_zfs_dataset -t fs' \
-+		;;
-+
-+	("rename")
-+		_arguments -A "-*" \
-+			- set1 \
-+			'-p[Create parent datasets]' \
-+			':filesystem/volume/snapshot:_zfs_dataset' \
-+			':filesystem/volume/snapshot:' \
-+			- set2 \
-+			'-r[Recursively rename snapshots of all descendent datasets]' \
-+			':snapshot:_zfs_dataset -t snap' \
-+			':snapshot:'
-+		;;
-+
-+	("list")
-+		_arguments -A "-*" \
-+			'-r[Recursively display children]' \
-+			'-H[Scripting mode]' \
-+			'-o[Properties to list]:property:_values -s , "property" $ro_properties $rw_propnames' \
-+			'*-s[Sort key (ascending)]:property:_values "property" $ro_properties $rw_propnames' \
-+			'*-S[Sort key (descending)]:property:_values "property" $ro_properties $rw_propnames' \
-+			'-t[Dataset types to list]:dataset type:_values -s , "dataset type" filesystem snapshot volume' \
-+			'*:filesystem/volume/snapshot:_zfs_dataset'
-+		;;
-+
-+	("set")
-+		_arguments \
-+			':property:_values -s , "property" $rw_properties' \
-+			'*:filesystem/volume:_zfs_dataset -t fs -t vol'
-+		;;
-+
-+	("get")
-+		_arguments -A "-*" \
-+			"-r[Recursively display children's properties]" \
-+			'-H[Scripting mode]' \
-+			'-p[Display numbers exactly]' \
-+			'-s[Specify sources]:source:_values -s , "source" local default inherited temporary none' \
-+			'-o[Specify fields]:field:_values -s , "field" name property value source' \
-+			':property:_values -s , "property" $ro_properties $rw_propnames all' \
-+			'*:filesystem/volume/snapshot:_zfs_dataset'
-+		;;
-+
-+	("inherit")
-+		_arguments -A "-*" \
-+			'-r[Recursively inherit property for all children]' \
-+			':property:_values -s , "property" $ro_properties $rw_properties' \
-+			'*:filesystem/volume:_zfs_dataset -t fs -t vol'
-+		;;
-+
-+	("mount")
-+		_arguments -A "-*" \
-+			'-o[Mount options]:mount options:_values -s , "option" {,no}{devices,exec,setuid} ro rw' \
-+			'-O[Overlay mount]' \
-+			'-v[Report mount progress]' \
-+			- set1 \
-+			':filesystem:_zfs_dataset -t fs' \
-+			- set2 \
-+			'-a[Mount all available ZFS filesystems]'
-+		;;
-+
-+	("unmount")
-+		_arguments -A "-*" \
-+			- set1 \
-+			'-f[Force unmount]' \
-+			':filesystem:_zfs_dataset -t fs -t mtpt' \
-+			- set2 \
-+			'-a[Unmount all ZFS filesystems]'
-+		;;
-+
-+	("share")
-+		_arguments -A "-*" \
-+			- set1 \
-+			'-a[Share all available ZFS filesystems]' \
-+			- set2 \
-+			':filesystem:_zfs_dataset -t fs'
-+		;;
-+
-+	("unshare")
-+		_arguments -A "-*" \
-+			- set1 \
-+			'-a[Unshare all shared ZFS filesystems]' \
-+			- set2 \
-+			'-F[Force unshare]' \
-+			':filesystem:_zfs_dataset -t fs -t mtpt'
-+		;;
-+
-+	("send")
-+		_arguments -A "-*" \
-+			'-i[Generate an incremental stream]:snapshot:_zfs_dataset -t snap' \
-+			':snapshot:_zfs_dataset -t snap'
-+		;;
-+
-+	("receive")
-+		_arguments -A "-*" \
-+			'-v[Verbose]' \
-+			'-n[Do not receive the stream]' \
-+			'-F[Force a rollback if necessary]' \
-+			- set1 \
-+			':filesystem/volume/snapshot:_zfs_dataset' \
-+			- set2 \
-+			'-d[Set path prefix]:filesystem:_zfs_dataset -t fs'
-+		;;
-+
-+	("allow"|"unallow")
-+		_message "unimplemented zfs subcommand: $service"
-+		;;
-+
-+	("upgrade")
-+		_arguments -A "-*" \
-+			- set1 \
-+			'-v[Verbose]' \
-+			- set2 \
-+			'-a[Upgrade all filesystems on all pools]' \
-+			'-r[Upgrade descendent filesystems, too]' \
-+			'-V[Upgrade to specified version]:version:(1 2)' \
-+			- set3 \
-+			'-r[Upgrade descendent filesystems, too]' \
-+			'-V[Upgrade to specified version]:version:(1 2)' \
-+			':filesystem:_zfs_dataset -t fs' \
-+		;;
-+
-+	(*)
-+		_message "unknown zfs subcommand: $service"
-+		;;
-+	esac
-+}
-+
-+_zfs "$@"
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_zfs_dataset b/shells/zsh/files/patch-Completion-BSD-Command-_zfs_dataset
deleted file mode 100644
index afca563aef77..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_zfs_dataset
+++ /dev/null
@@ -1,25 +0,0 @@
---- Completion/BSD/Command/_zfs_dataset.orig	2008-08-12 13:52:12.453362430 +0200
-+++ Completion/BSD/Command/_zfs_dataset	2008-08-11 21:02:13.000000000 +0200
-@@ -0,0 +1,22 @@
-+#autoload
-+
-+local -a type typearg list
-+
-+zparseopts -D -E -a type t+:
-+
-+[[ -n $type[(r)fs] ]]   && typearg=( filesystem )
-+[[ -n $type[(r)vol] ]]  && typearg=( $typearg volume )
-+[[ -n $type[(r)snap] ]] && typearg=( $typearg snapshot )
-+[[ -n $typearg ]] && typearg=( -t ${(j:,:)typearg} )
-+
-+datasetlist=( ${="$(zfs list -H -o name $typearg)":#no datasets available} )
-+
-+expl_type=${typearg[2,-1]//,/\/}
-+if [[ -n $type[(r)mtpt] ]]; then
-+	mlist=( ${="$(zfs list -H -o mountpoint $typearg)":#no mountpoints available} )
-+	datasetlist=( $datasetlist $mlist )
-+	expl_type="$expl_type/mountpoint"
-+fi
-+
-+# compadd "$@" - $list
-+_wanted dataset expl "$expl_type" _multi_parts "$@" / datasetlist
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_zfs_pool b/shells/zsh/files/patch-Completion-BSD-Command-_zfs_pool
deleted file mode 100644
index 3144277a528a..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_zfs_pool
+++ /dev/null
@@ -1,6 +0,0 @@
---- Completion/BSD/Command/_zfs_pool.orig	2008-08-12 13:52:12.459367620 +0200
-+++ Completion/BSD/Command/_zfs_pool	2008-08-11 21:02:23.000000000 +0200
-@@ -0,0 +1,3 @@
-+#autoload
-+
-+compadd "$@" - $(zpool list -H -o name)
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_zpool b/shells/zsh/files/patch-Completion-BSD-Command-_zpool
deleted file mode 100644
index 885691c47b10..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_zpool
+++ /dev/null
@@ -1,204 +0,0 @@
---- Completion/BSD/Command/_zpool.orig	2008-08-12 13:52:12.465374207 +0200
-+++ Completion/BSD/Command/_zpool	2008-08-11 21:01:58.000000000 +0200
-@@ -0,0 +1,201 @@
-+#compdef zpool
-+
-+_zpool() {
-+	local -a subcmds fields
-+
-+	subcmds=(
-+		  create destroy add remove list iostat status online
-+		  offline clear attach detach replace scrub import export 
-+		  upgrade history get set
-+	)
-+
-+	fields=(
-+		name\:"Pool name" size\:"Total size" used\:"Space used"
-+		available\:"Space available" capacity\:"Space used (percentage)"
-+		health\:"Health status"
-+	)
-+
-+	properties=(
-+		"bootfs:value:"
-+		"autoreplace:value:(on off)"
-+		"delegation:value:(on off)"
-+	)
-+	propnames=( ${properties%%:*} )
-+
-+	import_properties=(
-+		xattr
-+		copies
-+		shareiscsi
-+		canmount
-+		share
-+		sharenfs
-+		userprop
-+		mount
-+	)
-+
-+	if [[ $service == "zpool" ]]; then
-+		_arguments -C -A "-*" \
-+			'-\?[Help]' \
-+			'*::command:->subcmd' && return 0
-+
-+		if (( CURRENT == 1 )); then
-+			_wanted commands expl "zpool subcommand" compadd -a subcmds
-+			return
-+		fi
-+		service="$words[1]"
-+		curcontext="${curcontext%:*}=$service:"
-+	fi
-+
-+	case $service in
-+	(clear)
-+		_arguments \
-+			':pool name:_zfs_pool' \
-+			'*:virtual device:_files'
-+		;;
-+
-+	(create)
-+		# TODO: investigate better vdev handling
-+		_arguments -A "-*" \
-+			'-f[Force use of in-use devices]' \
-+			'-n[Display configuration without creating pool]' \
-+			'-R[Use alternate root]:alternate root:_files -/' \
-+			'-m[Set mountpoint for root dataset]:mountpoint:' \
-+			':pool name:' \
-+			'*:virtual device:_files'
-+		;;
-+
-+	(destroy)
-+		_arguments -A "-*" \
-+			'-f[Force active datasets to be unmounted]' \
-+			':pool name:_zfs_pool'
-+		;;
-+
-+	(add)
-+		_arguments -A "-*" \
-+			'-f[Force use of in-use devices]' \
-+			'-n[Display configuration without modifying pool]' \
-+			':pool name:_zfs_pool' \
-+			'*:virtual device:_files'
-+		;;
-+
-+	(list)
-+		_arguments \
-+			'-H[Scripted mode]' \
-+			'-o[Fields to list]:field:_values -s , "field" ${^fields/\:/[}\]' \
-+			'::pool name:_zfs_pool'
-+		;;
-+
-+	(iostat)
-+		_arguments -A "-*" \
-+			'-v[Verbose statistics]' \
-+			'*::pool name:_zfs_pool' \
-+			'::interval:' \
-+			'::count:'
-+		;;
-+
-+	(status)
-+		_arguments -A "-*" \
-+			'-v[Verbose information]' \
-+			'-x[Show only unhealthy pools]' \
-+			'*::pool name:_zfs_pool'
-+		;;
-+
-+	(offline)
-+		_arguments -A "-*" \
-+			'-t[Offline until next reboot]' \
-+			':pool name:_zfs_pool' \
-+			'*:virtual device:_files'
-+		;;
-+
-+	(online)
-+		_arguments \
-+			':pool name:_zfs_pool' \
-+			'*:virtual device:_files'
-+		;;
-+
-+	(attach)
-+		# TODO: first device should choose first from existing.
-+		_arguments \
-+			'-f[Force attach, even if in use]' \
-+			':pool name:_zfs_pool' \
-+			':virtual device:_files' \
-+			':virtual device:_files'
-+		;;
-+
-+	(detach)
-+		_arguments \
-+			':pool name:_zfs_pool' \
-+			':virtual device:_files'
-+		;;
-+
-+	(replace)
-+		_arguments -A "-*" \
-+			'-f[Force attach, even if in use]' \
-+			':pool name:_zfs_pool' \
-+			':virtual device:_files' \
-+			'::virtual device:_files'
-+		;;
-+
-+	(scrub)
-+		_arguments -A "-*" \
-+			'-s[Stop scrubbing]' \
-+			'*:pool name:_zfs_pool'
-+		;;
-+
-+	(export)
-+		_arguments -A "-*" \
-+			'-f[Forcefully unmount all datasets]' \
-+			'*:pool name:_zfs_pool'
-+		;;
-+
-+	(import)
-+		# TODO: -o should complete options
-+		_arguments -A "-*" \
-+			'*-d[Search for devices or files in directory]:_files -/' \
-+			'-D[Destroyed pools]' \
-+			'-f[Force import]' \
-+			- set1 \
-+			'-o[Mount options]' \
-+			'-p[Set property]:property:_values -s , "property" $import_properties' \
-+			'-R[Alternate root]:_files -/' \
-+			'*:pool name or id:_zfs_pool' \
-+			'::new pool name:' \
-+			- set2 \
-+			'-a[All pools]'
-+		;;
-+
-+	(get)
-+		_arguments -A "-*" \
-+			':property:_values -s , "property" $propnames all' \
-+			'*:pool name:_zfs_pool'
-+		;;
-+
-+	(set)
-+		_arguments -A "-*" \
-+			':property:_values -s , "property" $properties' \
-+			'*:pool name:_zfs_pool'
-+		;;
-+
-+	(upgrade)
-+		_arguments -A "-*" \
-+			- set1 \
-+			'-v[Display ZFS versions and descriptions]' \
-+			- set2 \
-+			'-a[Upgrade all pools]' \
-+			'*:pool name:_zfs_pool'
-+		;;
-+
-+	(history)
-+		_arguments -A "-*" \
-+			'-i[Display internal events]' \
-+			'-l[Long format]' \
-+			'*:pool name:_zfs_pool'
-+		;;
-+
-+	(*)
-+		_message "unknown zpool subcommand: $service"
-+		;;
-+	esac
-+}
-+
-+_zpool "$@"
diff --git a/shells/zsh/files/patch-Completion-Unix-Command-_locate b/shells/zsh/files/patch-Completion-Unix-Command-_locate
deleted file mode 100644
index 5d95703beb87..000000000000
--- a/shells/zsh/files/patch-Completion-Unix-Command-_locate
+++ /dev/null
@@ -1,11 +0,0 @@
---- Completion/Unix/Command/_locate.orig	2006-09-27 09:50:25.000000000 -0500
-+++ Completion/Unix/Command/_locate	2007-08-20 22:08:08.000000000 -0500
-@@ -11,7 +11,7 @@
-   ;;
- 
-   (locate)
--  input="$(_call_program locate $words[1] -V)"
-+  input="$(_call_program locate $words[1] -V 2>&1)"
-   case $input in
-     (*mlocate*)
-     ltype=mlocate
diff --git a/shells/zsh/files/patch-Src_Zle_compresult.c b/shells/zsh/files/patch-Src_Zle_compresult.c
deleted file mode 100644
index a41e2c2c0938..000000000000
--- a/shells/zsh/files/patch-Src_Zle_compresult.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- Src/Zle/compresult.c.orig	2008-05-07 10:19:11.000000000 -0300
-+++ Src/Zle/compresult.c	2008-05-07 10:19:35.000000000 -0300
-@@ -1188,6 +1188,12 @@
- {
-     int was_meta;
- 
-+    /* Just list the matches if the list was requested. */
-+    if (lst == COMP_LIST_COMPLETE) {
-+	showinglist = -2;
-+	return;
-+    }
-+
-     /* Already metafied when called from domenuselect already */
-     if (zlemetaline == NULL) {
- 	was_meta = 0;
-@@ -1195,12 +1201,6 @@
-     } else
- 	was_meta = 1;
- 
--    /* Just list the matches if the list was requested. */
--    if (lst == COMP_LIST_COMPLETE) {
--	showinglist = -2;
--	return;
--    }
--
-     /* Otherwise go to the next match in the array... */
-     do {
- 	if (!*++(minfo.cur)) {
diff --git a/shells/zsh/files/patch-ncurses b/shells/zsh/files/patch-ncurses
deleted file mode 100644
index 6a84cac3a901..000000000000
--- a/shells/zsh/files/patch-ncurses
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure.ac.orig	2008-03-28 12:49:32.000000000 +0100
-+++ configure.ac	2008-05-05 09:47:30.860369561 +0200
-@@ -669,20 +669,20 @@
-    termcap_curses_order="$ncursesw_test tinfo termcap $ncurses_test curses" ;;
- esac])dnl
- 
--AH_TEMPLATE([ZSH_CURSES_NEEDS_XOPEN],
--[Define if the curses libraries need _XOPEN_SOURCE_EXTENDED defined])
--AC_CACHE_CHECK(if the curses library needs _XOPEN_SOURCE_EXTENDED,
--zsh_cv_curses_needs_xopen,
-+AH_TEMPLATE([ZSH_NO_XOPEN],
-+[Define if _XOPEN_SOURCE_EXTENDED should not be defined to avoid clashes])
-+AC_CACHE_CHECK(if _XOPEN_SOURCE_EXTENDED should not be defined,
-+zsh_cv_no_xopen,
--[case "$host_os" in
--  *openbsd*)
--  zsh_cv_curses_needs_xopen=no
-+[[case "$host_os" in
-+  *openbsd*|*freebsd5*|*freebsd6.[012]*)
-+  zsh_cv_no_xopen=yes
-   ;;
-   *)
--  zsh_cv_curses_needs_xopen=yes
-+  zsh_cv_no_xopen=no
-   ;;
--esac])
-+esac]])
--if test x$zsh_cv_curses_needs_xopen = xyes; then
--  AC_DEFINE(ZSH_CURSES_NEEDS_XOPEN)
-+if test x$zsh_cv_no_xopen = xyes; then
-+  AC_DEFINE(ZSH_NO_XOPEN)
- fi
- 
- dnl Check for tigetflag (terminfo) before tgetent (termcap).
---- Src/system.h.orig	2007-12-14 13:43:33.000000000 +0100
-+++ Src/system.h	2008-05-05 09:50:17.333164563 +0200
-@@ -52,9 +52,20 @@
- # undef HAVE_SYS_UTSNAME_H
- #endif
- 
--#if defined(ZSH_CURSES_SOURCE) && defined(ZSH_CURSES_NEEDS_XOPEN)
--#define _XOPEN_SOURCE_EXTENDED 1
--#endif
-+#ifndef ZSH_NO_XOPEN
-+# ifdef ZSH_CURSES_SOURCE
-+#  define _XOPEN_SOURCE_EXTENDED 1
-+# else
-+#  ifdef MULTIBYTE_SUPPORT
-+/*
-+ * Needed for wcwidth() which is part of XSI.
-+ * Various other uses of the interface mean we can't get away with just
-+ * _XOPEN_SOURCE.
-+ */
-+#   define _XOPEN_SOURCE_EXTENDED 1
-+#  endif /* MULTIBYTE_SUPPORT */
-+# endif /* ZSH_CURSES_SOURCE */
-+#endif /* ZSH_NO_XOPEN */
- 
- /*
-  * Solaris by default zeroes all elements of the tm structure in
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index b01094e5630f..2db89e648343 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -1,800 +1,861 @@
 @comment $FreeBSD$
 bin/zsh
 @exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
 @unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 bin/rzsh
 @exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
 @unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 bin/zsh-%%ZSH_VER%%
 @exec   mkdir %%ZSH_ETCDIR%% 2> /dev/null || true
 @dirrmtry %%ZSH_ETCDIR%%
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/compctl.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complete.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complist.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/computil.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/curses.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/datetime.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/deltochar.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/example.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/files.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/langinfo.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/mapfile.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/mathfunc.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/net/socket.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/net/tcp.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/newuser.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/parameter.so
 %%PCRE%%%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/pcre.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/regex.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/rlimits.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/sched.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/stat.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/system.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/termcap.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/terminfo.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zftp.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zle.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zleparameter.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zprof.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zpty.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zselect.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh/net
 %%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh
 %%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%
 %%NO_STATIC%%@dirrm lib/zsh
 @exec   mkdir %%ZSH_SITEFNDIR%% 2> /dev/null || true
-@unexec rmdir %%ZSH_SITEFNDIR%% 2> /dev/null || true
+@dirrmtry %%ZSH_SITEFNDIR%%
 %%ZSH_FNDIR%%/Calendar/age
 %%ZSH_FNDIR%%/Calendar/calendar
 %%ZSH_FNDIR%%/Calendar/calendar_add
 %%ZSH_FNDIR%%/Calendar/calendar_edit
 %%ZSH_FNDIR%%/Calendar/calendar_lockfiles
 %%ZSH_FNDIR%%/Calendar/calendar_parse
 %%ZSH_FNDIR%%/Calendar/calendar_read
 %%ZSH_FNDIR%%/Calendar/calendar_scandate
 %%ZSH_FNDIR%%/Calendar/calendar_show
 %%ZSH_FNDIR%%/Calendar/calendar_showdate
 %%ZSH_FNDIR%%/Calendar/calendar_sort
 %%ZSH_FNDIR%%/Completion/AIX/_floppy
 %%ZSH_FNDIR%%/Completion/AIX/_logical_volumes
 %%ZSH_FNDIR%%/Completion/AIX/_lscfg
 %%ZSH_FNDIR%%/Completion/AIX/_lsdev
 %%ZSH_FNDIR%%/Completion/AIX/_lslv
 %%ZSH_FNDIR%%/Completion/AIX/_lspv
 %%ZSH_FNDIR%%/Completion/AIX/_lsvg
 %%ZSH_FNDIR%%/Completion/AIX/_object_classes
 %%ZSH_FNDIR%%/Completion/AIX/_physical_volumes
 %%ZSH_FNDIR%%/Completion/AIX/_smit
 %%ZSH_FNDIR%%/Completion/AIX/_volume_groups
 %%ZSH_FNDIR%%/Completion/BSD/_bsd_pkg
 %%ZSH_FNDIR%%/Completion/BSD/_chflags
 %%ZSH_FNDIR%%/Completion/BSD/_csup
 %%ZSH_FNDIR%%/Completion/BSD/_cvsup
 %%ZSH_FNDIR%%/Completion/BSD/_fetch
 %%ZSH_FNDIR%%/Completion/BSD/_freebsd-update
 %%ZSH_FNDIR%%/Completion/BSD/_kld
+%%ZSH_FNDIR%%/Completion/BSD/_portaudit
 %%ZSH_FNDIR%%/Completion/BSD/_portlint
 %%ZSH_FNDIR%%/Completion/BSD/_portsnap
 %%ZSH_FNDIR%%/Completion/BSD/_powerd
-%%ZSH_FNDIR%%/Completion/BSD/_zfs
-%%ZSH_FNDIR%%/Completion/BSD/_zfs_dataset
-%%ZSH_FNDIR%%/Completion/BSD/_zfs_pool
-%%ZSH_FNDIR%%/Completion/BSD/_zpool
 %%ZSH_FNDIR%%/Completion/Base/_all_labels
 %%ZSH_FNDIR%%/Completion/Base/_all_matches
 %%ZSH_FNDIR%%/Completion/Base/_alternative
 %%ZSH_FNDIR%%/Completion/Base/_approximate
 %%ZSH_FNDIR%%/Completion/Base/_arg_compile
 %%ZSH_FNDIR%%/Completion/Base/_arguments
 %%ZSH_FNDIR%%/Completion/Base/_bash_completions
 %%ZSH_FNDIR%%/Completion/Base/_cache_invalid
 %%ZSH_FNDIR%%/Completion/Base/_call_function
 %%ZSH_FNDIR%%/Completion/Base/_call_program
 %%ZSH_FNDIR%%/Completion/Base/_combination
 %%ZSH_FNDIR%%/Completion/Base/_complete
 %%ZSH_FNDIR%%/Completion/Base/_complete_debug
 %%ZSH_FNDIR%%/Completion/Base/_complete_help
 %%ZSH_FNDIR%%/Completion/Base/_complete_help_generic
 %%ZSH_FNDIR%%/Completion/Base/_complete_tag
 %%ZSH_FNDIR%%/Completion/Base/_correct
 %%ZSH_FNDIR%%/Completion/Base/_correct_filename
 %%ZSH_FNDIR%%/Completion/Base/_correct_word
 %%ZSH_FNDIR%%/Completion/Base/_describe
 %%ZSH_FNDIR%%/Completion/Base/_description
 %%ZSH_FNDIR%%/Completion/Base/_dispatch
 %%ZSH_FNDIR%%/Completion/Base/_expand
 %%ZSH_FNDIR%%/Completion/Base/_expand_alias
 %%ZSH_FNDIR%%/Completion/Base/_expand_word
 %%ZSH_FNDIR%%/Completion/Base/_generic
 %%ZSH_FNDIR%%/Completion/Base/_guard
 %%ZSH_FNDIR%%/Completion/Base/_history
 %%ZSH_FNDIR%%/Completion/Base/_history_complete_word
 %%ZSH_FNDIR%%/Completion/Base/_ignored
 %%ZSH_FNDIR%%/Completion/Base/_list
 %%ZSH_FNDIR%%/Completion/Base/_main_complete
 %%ZSH_FNDIR%%/Completion/Base/_match
 %%ZSH_FNDIR%%/Completion/Base/_menu
 %%ZSH_FNDIR%%/Completion/Base/_message
 %%ZSH_FNDIR%%/Completion/Base/_most_recent_file
 %%ZSH_FNDIR%%/Completion/Base/_multi_parts
 %%ZSH_FNDIR%%/Completion/Base/_next_label
 %%ZSH_FNDIR%%/Completion/Base/_next_tags
 %%ZSH_FNDIR%%/Completion/Base/_normal
 %%ZSH_FNDIR%%/Completion/Base/_nothing
 %%ZSH_FNDIR%%/Completion/Base/_oldlist
 %%ZSH_FNDIR%%/Completion/Base/_pick_variant
 %%ZSH_FNDIR%%/Completion/Base/_prefix
 %%ZSH_FNDIR%%/Completion/Base/_read_comp
 %%ZSH_FNDIR%%/Completion/Base/_regex_arguments
 %%ZSH_FNDIR%%/Completion/Base/_regex_words
 %%ZSH_FNDIR%%/Completion/Base/_requested
 %%ZSH_FNDIR%%/Completion/Base/_retrieve_cache
 %%ZSH_FNDIR%%/Completion/Base/_sep_parts
 %%ZSH_FNDIR%%/Completion/Base/_set_command
 %%ZSH_FNDIR%%/Completion/Base/_setup
 %%ZSH_FNDIR%%/Completion/Base/_store_cache
 %%ZSH_FNDIR%%/Completion/Base/_sub_commands
 %%ZSH_FNDIR%%/Completion/Base/_tags
 %%ZSH_FNDIR%%/Completion/Base/_values
 %%ZSH_FNDIR%%/Completion/Base/_wanted
 %%ZSH_FNDIR%%/Completion/Cygwin/_cygcheck
 %%ZSH_FNDIR%%/Completion/Cygwin/_cygpath
 %%ZSH_FNDIR%%/Completion/Cygwin/_cygrunsrv
 %%ZSH_FNDIR%%/Completion/Cygwin/_cygserver
 %%ZSH_FNDIR%%/Completion/Cygwin/_cygstart
 %%ZSH_FNDIR%%/Completion/Cygwin/_dumper
 %%ZSH_FNDIR%%/Completion/Cygwin/_getclip
 %%ZSH_FNDIR%%/Completion/Cygwin/_getfacl
 %%ZSH_FNDIR%%/Completion/Cygwin/_mkshortcut
 %%ZSH_FNDIR%%/Completion/Cygwin/_mkzsh
 %%ZSH_FNDIR%%/Completion/Cygwin/_pscp
 %%ZSH_FNDIR%%/Completion/Cygwin/_putclip
 %%ZSH_FNDIR%%/Completion/Darwin/_defaults
 %%ZSH_FNDIR%%/Completion/Darwin/_fink
 %%ZSH_FNDIR%%/Completion/Darwin/_hdiutil
 %%ZSH_FNDIR%%/Completion/Darwin/_mac_applications
 %%ZSH_FNDIR%%/Completion/Darwin/_mac_files_for_application
 %%ZSH_FNDIR%%/Completion/Darwin/_open
 %%ZSH_FNDIR%%/Completion/Darwin/_qtplay
 %%ZSH_FNDIR%%/Completion/Darwin/_retrieve_mac_apps
 %%ZSH_FNDIR%%/Completion/Darwin/_softwareupdate
 %%ZSH_FNDIR%%/Completion/Debian/_a2utils
 %%ZSH_FNDIR%%/Completion/Debian/_apt
 %%ZSH_FNDIR%%/Completion/Debian/_apt-file
 %%ZSH_FNDIR%%/Completion/Debian/_apt-move
 %%ZSH_FNDIR%%/Completion/Debian/_apt-show-versions
 %%ZSH_FNDIR%%/Completion/Debian/_aptitude
 %%ZSH_FNDIR%%/Completion/Debian/_auto-apt
 %%ZSH_FNDIR%%/Completion/Debian/_bts
 %%ZSH_FNDIR%%/Completion/Debian/_bug
 %%ZSH_FNDIR%%/Completion/Debian/_cdbs-edit-patch
 %%ZSH_FNDIR%%/Completion/Debian/_dak
 %%ZSH_FNDIR%%/Completion/Debian/_dchroot
 %%ZSH_FNDIR%%/Completion/Debian/_dchroot-dsa
 %%ZSH_FNDIR%%/Completion/Debian/_deb_packages
 %%ZSH_FNDIR%%/Completion/Debian/_debchange
 %%ZSH_FNDIR%%/Completion/Debian/_debdiff
 %%ZSH_FNDIR%%/Completion/Debian/_debfoster
 %%ZSH_FNDIR%%/Completion/Debian/_debsign
 %%ZSH_FNDIR%%/Completion/Debian/_dlocate
 %%ZSH_FNDIR%%/Completion/Debian/_dpatch-edit-patch
 %%ZSH_FNDIR%%/Completion/Debian/_dpkg
 %%ZSH_FNDIR%%/Completion/Debian/_dpkg-buildpackage
 %%ZSH_FNDIR%%/Completion/Debian/_dpkg-cross
 %%ZSH_FNDIR%%/Completion/Debian/_dpkg-repack
 %%ZSH_FNDIR%%/Completion/Debian/_dpkg_source
 %%ZSH_FNDIR%%/Completion/Debian/_dput
 %%ZSH_FNDIR%%/Completion/Debian/_dupload
+%%ZSH_FNDIR%%/Completion/Debian/_grep-excuses
 %%ZSH_FNDIR%%/Completion/Debian/_invoke-rc.d
 %%ZSH_FNDIR%%/Completion/Debian/_lighttpd
 %%ZSH_FNDIR%%/Completion/Debian/_linda
 %%ZSH_FNDIR%%/Completion/Debian/_lintian
 %%ZSH_FNDIR%%/Completion/Debian/_madison
 %%ZSH_FNDIR%%/Completion/Debian/_make-kpkg
 %%ZSH_FNDIR%%/Completion/Debian/_members
 %%ZSH_FNDIR%%/Completion/Debian/_mergechanges
 %%ZSH_FNDIR%%/Completion/Debian/_module-assistant
 %%ZSH_FNDIR%%/Completion/Debian/_piuparts
 %%ZSH_FNDIR%%/Completion/Debian/_reprepro
 %%ZSH_FNDIR%%/Completion/Debian/_schroot
 %%ZSH_FNDIR%%/Completion/Debian/_svn-buildpackage
 %%ZSH_FNDIR%%/Completion/Debian/_toolchain-source
 %%ZSH_FNDIR%%/Completion/Debian/_update-alternatives
 %%ZSH_FNDIR%%/Completion/Debian/_update-rc.d
 %%ZSH_FNDIR%%/Completion/Debian/_uscan
 %%ZSH_FNDIR%%/Completion/Debian/_vim-addons
 %%ZSH_FNDIR%%/Completion/Debian/_wajig
 %%ZSH_FNDIR%%/Completion/Debian/_wanna-build
 %%ZSH_FNDIR%%/Completion/Linux/_acpi
 %%ZSH_FNDIR%%/Completion/Linux/_acpitool
 %%ZSH_FNDIR%%/Completion/Linux/_analyseplugin
 %%ZSH_FNDIR%%/Completion/Linux/_brctl
+%%ZSH_FNDIR%%/Completion/Linux/_chrt
+%%ZSH_FNDIR%%/Completion/Linux/_ethtool
 %%ZSH_FNDIR%%/Completion/Linux/_fuse_arguments
 %%ZSH_FNDIR%%/Completion/Linux/_fuse_values
 %%ZSH_FNDIR%%/Completion/Linux/_fusermount
+%%ZSH_FNDIR%%/Completion/Linux/_ionice
+%%ZSH_FNDIR%%/Completion/Linux/_ipset
 %%ZSH_FNDIR%%/Completion/Linux/_iptables
 %%ZSH_FNDIR%%/Completion/Linux/_iwconfig
 %%ZSH_FNDIR%%/Completion/Linux/_losetup
 %%ZSH_FNDIR%%/Completion/Linux/_lsusb
 %%ZSH_FNDIR%%/Completion/Linux/_mii-tool
 %%ZSH_FNDIR%%/Completion/Linux/_modutils
 %%ZSH_FNDIR%%/Completion/Linux/_mondo
 %%ZSH_FNDIR%%/Completion/Linux/_pkgtool
 %%ZSH_FNDIR%%/Completion/Linux/_sshfs
+%%ZSH_FNDIR%%/Completion/Linux/_strace
 %%ZSH_FNDIR%%/Completion/Linux/_tpb
 %%ZSH_FNDIR%%/Completion/Linux/_tpconfig
 %%ZSH_FNDIR%%/Completion/Linux/_tune2fs
 %%ZSH_FNDIR%%/Completion/Linux/_uml
 %%ZSH_FNDIR%%/Completion/Linux/_valgrind
 %%ZSH_FNDIR%%/Completion/Linux/_vserver
 %%ZSH_FNDIR%%/Completion/Linux/_wakeup_capable_devices
 %%ZSH_FNDIR%%/Completion/Linux/_yast
 %%ZSH_FNDIR%%/Completion/Mandriva/_urpmi
 %%ZSH_FNDIR%%/Completion/Redhat/_rpm
 %%ZSH_FNDIR%%/Completion/Redhat/_service
 %%ZSH_FNDIR%%/Completion/Redhat/_yum
 %%ZSH_FNDIR%%/Completion/Unix/_a2ps
 %%ZSH_FNDIR%%/Completion/Unix/_aap
 %%ZSH_FNDIR%%/Completion/Unix/_ant
 %%ZSH_FNDIR%%/Completion/Unix/_antiword
 %%ZSH_FNDIR%%/Completion/Unix/_apachectl
 %%ZSH_FNDIR%%/Completion/Unix/_apm
 %%ZSH_FNDIR%%/Completion/Unix/_arch_archives
 %%ZSH_FNDIR%%/Completion/Unix/_arch_namespace
 %%ZSH_FNDIR%%/Completion/Unix/_arp
 %%ZSH_FNDIR%%/Completion/Unix/_arping
 %%ZSH_FNDIR%%/Completion/Unix/_attr
+%%ZSH_FNDIR%%/Completion/Unix/_awk
 %%ZSH_FNDIR%%/Completion/Unix/_baz
 %%ZSH_FNDIR%%/Completion/Unix/_bind_addresses
 %%ZSH_FNDIR%%/Completion/Unix/_bison
 %%ZSH_FNDIR%%/Completion/Unix/_bittorrent
 %%ZSH_FNDIR%%/Completion/Unix/_bogofilter
 %%ZSH_FNDIR%%/Completion/Unix/_bzip2
 %%ZSH_FNDIR%%/Completion/Unix/_bzr
 %%ZSH_FNDIR%%/Completion/Unix/_cal
 %%ZSH_FNDIR%%/Completion/Unix/_calendar
 %%ZSH_FNDIR%%/Completion/Unix/_canonical_paths
 %%ZSH_FNDIR%%/Completion/Unix/_ccal
 %%ZSH_FNDIR%%/Completion/Unix/_cdcd
 %%ZSH_FNDIR%%/Completion/Unix/_cdrdao
 %%ZSH_FNDIR%%/Completion/Unix/_cdrecord
 %%ZSH_FNDIR%%/Completion/Unix/_chkconfig
 %%ZSH_FNDIR%%/Completion/Unix/_chmod
 %%ZSH_FNDIR%%/Completion/Unix/_chown
 %%ZSH_FNDIR%%/Completion/Unix/_comm
 %%ZSH_FNDIR%%/Completion/Unix/_compress
 %%ZSH_FNDIR%%/Completion/Unix/_configure
 %%ZSH_FNDIR%%/Completion/Unix/_cowsay
 %%ZSH_FNDIR%%/Completion/Unix/_cp
 %%ZSH_FNDIR%%/Completion/Unix/_cpio
 %%ZSH_FNDIR%%/Completion/Unix/_cplay
 %%ZSH_FNDIR%%/Completion/Unix/_cssh
 %%ZSH_FNDIR%%/Completion/Unix/_ctags_tags
 %%ZSH_FNDIR%%/Completion/Unix/_cut
 %%ZSH_FNDIR%%/Completion/Unix/_cvs
 %%ZSH_FNDIR%%/Completion/Unix/_darcs
 %%ZSH_FNDIR%%/Completion/Unix/_date
 %%ZSH_FNDIR%%/Completion/Unix/_dd
 %%ZSH_FNDIR%%/Completion/Unix/_dhclient
 %%ZSH_FNDIR%%/Completion/Unix/_dict
 %%ZSH_FNDIR%%/Completion/Unix/_dict_words
 %%ZSH_FNDIR%%/Completion/Unix/_diff
 %%ZSH_FNDIR%%/Completion/Unix/_diff_options
 %%ZSH_FNDIR%%/Completion/Unix/_diffstat
 %%ZSH_FNDIR%%/Completion/Unix/_dir_list
 %%ZSH_FNDIR%%/Completion/Unix/_directories
+%%ZSH_FNDIR%%/Completion/Unix/_django
 %%ZSH_FNDIR%%/Completion/Unix/_dmidecode
 %%ZSH_FNDIR%%/Completion/Unix/_domains
 %%ZSH_FNDIR%%/Completion/Unix/_du
 %%ZSH_FNDIR%%/Completion/Unix/_dvi
 %%ZSH_FNDIR%%/Completion/Unix/_ecasound
 %%ZSH_FNDIR%%/Completion/Unix/_elinks
 %%ZSH_FNDIR%%/Completion/Unix/_elm
 %%ZSH_FNDIR%%/Completion/Unix/_email_addresses
 %%ZSH_FNDIR%%/Completion/Unix/_enscript
 %%ZSH_FNDIR%%/Completion/Unix/_env
 %%ZSH_FNDIR%%/Completion/Unix/_fakeroot
 %%ZSH_FNDIR%%/Completion/Unix/_fetchmail
 %%ZSH_FNDIR%%/Completion/Unix/_figlet
 %%ZSH_FNDIR%%/Completion/Unix/_file_systems
 %%ZSH_FNDIR%%/Completion/Unix/_files
 %%ZSH_FNDIR%%/Completion/Unix/_find
 %%ZSH_FNDIR%%/Completion/Unix/_finger
 %%ZSH_FNDIR%%/Completion/Unix/_flasher
 %%ZSH_FNDIR%%/Completion/Unix/_flex
 %%ZSH_FNDIR%%/Completion/Unix/_fortune
 %%ZSH_FNDIR%%/Completion/Unix/_fsh
 %%ZSH_FNDIR%%/Completion/Unix/_fuser
 %%ZSH_FNDIR%%/Completion/Unix/_gcc
 %%ZSH_FNDIR%%/Completion/Unix/_gdb
 %%ZSH_FNDIR%%/Completion/Unix/_genisoimage
 %%ZSH_FNDIR%%/Completion/Unix/_getconf
 %%ZSH_FNDIR%%/Completion/Unix/_getent
 %%ZSH_FNDIR%%/Completion/Unix/_getmail
 %%ZSH_FNDIR%%/Completion/Unix/_git
 %%ZSH_FNDIR%%/Completion/Unix/_global
 %%ZSH_FNDIR%%/Completion/Unix/_global_tags
 %%ZSH_FNDIR%%/Completion/Unix/_gnu_generic
+%%ZSH_FNDIR%%/Completion/Unix/_gnupod
 %%ZSH_FNDIR%%/Completion/Unix/_gnutls
 %%ZSH_FNDIR%%/Completion/Unix/_gpg
 %%ZSH_FNDIR%%/Completion/Unix/_gphoto2
 %%ZSH_FNDIR%%/Completion/Unix/_gprof
 %%ZSH_FNDIR%%/Completion/Unix/_grep
 %%ZSH_FNDIR%%/Completion/Unix/_groff
 %%ZSH_FNDIR%%/Completion/Unix/_groups
 %%ZSH_FNDIR%%/Completion/Unix/_growisofs
 %%ZSH_FNDIR%%/Completion/Unix/_gs
 %%ZSH_FNDIR%%/Completion/Unix/_guilt
 %%ZSH_FNDIR%%/Completion/Unix/_gzip
 %%ZSH_FNDIR%%/Completion/Unix/_hosts
 %%ZSH_FNDIR%%/Completion/Unix/_iconv
 %%ZSH_FNDIR%%/Completion/Unix/_id
 %%ZSH_FNDIR%%/Completion/Unix/_ifconfig
+%%ZSH_FNDIR%%/Completion/Unix/_iftop
 %%ZSH_FNDIR%%/Completion/Unix/_imagemagick
 %%ZSH_FNDIR%%/Completion/Unix/_init_d
 %%ZSH_FNDIR%%/Completion/Unix/_ip
 %%ZSH_FNDIR%%/Completion/Unix/_irssi
 %%ZSH_FNDIR%%/Completion/Unix/_ispell
 %%ZSH_FNDIR%%/Completion/Unix/_java
 %%ZSH_FNDIR%%/Completion/Unix/_java_class
 %%ZSH_FNDIR%%/Completion/Unix/_joe
+%%ZSH_FNDIR%%/Completion/Unix/_join
 %%ZSH_FNDIR%%/Completion/Unix/_killall
 %%ZSH_FNDIR%%/Completion/Unix/_knock
 %%ZSH_FNDIR%%/Completion/Unix/_kvno
 %%ZSH_FNDIR%%/Completion/Unix/_last
 %%ZSH_FNDIR%%/Completion/Unix/_ld_debug
 %%ZSH_FNDIR%%/Completion/Unix/_ldd
 %%ZSH_FNDIR%%/Completion/Unix/_less
 %%ZSH_FNDIR%%/Completion/Unix/_links
 %%ZSH_FNDIR%%/Completion/Unix/_list_files
 %%ZSH_FNDIR%%/Completion/Unix/_loadkeys
 %%ZSH_FNDIR%%/Completion/Unix/_locales
 %%ZSH_FNDIR%%/Completion/Unix/_locate
 %%ZSH_FNDIR%%/Completion/Unix/_look
 %%ZSH_FNDIR%%/Completion/Unix/_lp
 %%ZSH_FNDIR%%/Completion/Unix/_ls
 %%ZSH_FNDIR%%/Completion/Unix/_lsof
 %%ZSH_FNDIR%%/Completion/Unix/_lynx
 %%ZSH_FNDIR%%/Completion/Unix/_lzop
 %%ZSH_FNDIR%%/Completion/Unix/_mail
 %%ZSH_FNDIR%%/Completion/Unix/_mailboxes
 %%ZSH_FNDIR%%/Completion/Unix/_make
 %%ZSH_FNDIR%%/Completion/Unix/_man
 %%ZSH_FNDIR%%/Completion/Unix/_md5sum
 %%ZSH_FNDIR%%/Completion/Unix/_mencal
 %%ZSH_FNDIR%%/Completion/Unix/_mercurial
 %%ZSH_FNDIR%%/Completion/Unix/_metaflac
 %%ZSH_FNDIR%%/Completion/Unix/_mh
 %%ZSH_FNDIR%%/Completion/Unix/_mime_types
 %%ZSH_FNDIR%%/Completion/Unix/_mkdir
 %%ZSH_FNDIR%%/Completion/Unix/_module
 %%ZSH_FNDIR%%/Completion/Unix/_monotone
 %%ZSH_FNDIR%%/Completion/Unix/_mount
 %%ZSH_FNDIR%%/Completion/Unix/_mpc
 %%ZSH_FNDIR%%/Completion/Unix/_mt
 %%ZSH_FNDIR%%/Completion/Unix/_mtools
 %%ZSH_FNDIR%%/Completion/Unix/_mtr
 %%ZSH_FNDIR%%/Completion/Unix/_mutt
 %%ZSH_FNDIR%%/Completion/Unix/_my_accounts
 %%ZSH_FNDIR%%/Completion/Unix/_mysql_utils
 %%ZSH_FNDIR%%/Completion/Unix/_mysqldiff
 %%ZSH_FNDIR%%/Completion/Unix/_ncftp
 %%ZSH_FNDIR%%/Completion/Unix/_net_interfaces
 %%ZSH_FNDIR%%/Completion/Unix/_netcat
 %%ZSH_FNDIR%%/Completion/Unix/_newsgroups
 %%ZSH_FNDIR%%/Completion/Unix/_nice
 %%ZSH_FNDIR%%/Completion/Unix/_nmap
 %%ZSH_FNDIR%%/Completion/Unix/_nslookup
 %%ZSH_FNDIR%%/Completion/Unix/_other_accounts
 %%ZSH_FNDIR%%/Completion/Unix/_pack
 %%ZSH_FNDIR%%/Completion/Unix/_patch
 %%ZSH_FNDIR%%/Completion/Unix/_path_commands
 %%ZSH_FNDIR%%/Completion/Unix/_path_files
 %%ZSH_FNDIR%%/Completion/Unix/_pax
 %%ZSH_FNDIR%%/Completion/Unix/_pbm
 %%ZSH_FNDIR%%/Completion/Unix/_pdf
 %%ZSH_FNDIR%%/Completion/Unix/_perforce
 %%ZSH_FNDIR%%/Completion/Unix/_perl
 %%ZSH_FNDIR%%/Completion/Unix/_perl_basepods
 %%ZSH_FNDIR%%/Completion/Unix/_perl_modules
 %%ZSH_FNDIR%%/Completion/Unix/_perldoc
 %%ZSH_FNDIR%%/Completion/Unix/_php
 %%ZSH_FNDIR%%/Completion/Unix/_pids
 %%ZSH_FNDIR%%/Completion/Unix/_pine
 %%ZSH_FNDIR%%/Completion/Unix/_ping
 %%ZSH_FNDIR%%/Completion/Unix/_pkg-config
+%%ZSH_FNDIR%%/Completion/Unix/_pkg_instance
+%%ZSH_FNDIR%%/Completion/Unix/_pkgadd
+%%ZSH_FNDIR%%/Completion/Unix/_pkginfo
+%%ZSH_FNDIR%%/Completion/Unix/_pkgrm
 %%ZSH_FNDIR%%/Completion/Unix/_pon
 %%ZSH_FNDIR%%/Completion/Unix/_ports
 %%ZSH_FNDIR%%/Completion/Unix/_postfix
 %%ZSH_FNDIR%%/Completion/Unix/_prcs
 %%ZSH_FNDIR%%/Completion/Unix/_printenv
 %%ZSH_FNDIR%%/Completion/Unix/_printers
 %%ZSH_FNDIR%%/Completion/Unix/_ps
 %%ZSH_FNDIR%%/Completion/Unix/_pspdf
 %%ZSH_FNDIR%%/Completion/Unix/_psutils
 %%ZSH_FNDIR%%/Completion/Unix/_pump
 %%ZSH_FNDIR%%/Completion/Unix/_python
 %%ZSH_FNDIR%%/Completion/Unix/_qemu
 %%ZSH_FNDIR%%/Completion/Unix/_quilt
 %%ZSH_FNDIR%%/Completion/Unix/_raggle
 %%ZSH_FNDIR%%/Completion/Unix/_rake
 %%ZSH_FNDIR%%/Completion/Unix/_ranlib
 %%ZSH_FNDIR%%/Completion/Unix/_rar
 %%ZSH_FNDIR%%/Completion/Unix/_rcs
 %%ZSH_FNDIR%%/Completion/Unix/_renice
 %%ZSH_FNDIR%%/Completion/Unix/_ri
 %%ZSH_FNDIR%%/Completion/Unix/_rlogin
+%%ZSH_FNDIR%%/Completion/Unix/_rm
 %%ZSH_FNDIR%%/Completion/Unix/_rrdtool
 %%ZSH_FNDIR%%/Completion/Unix/_rsync
 %%ZSH_FNDIR%%/Completion/Unix/_rubber
 %%ZSH_FNDIR%%/Completion/Unix/_ruby
 %%ZSH_FNDIR%%/Completion/Unix/_sablotron
 %%ZSH_FNDIR%%/Completion/Unix/_samba
 %%ZSH_FNDIR%%/Completion/Unix/_sccs
 %%ZSH_FNDIR%%/Completion/Unix/_screen
 %%ZSH_FNDIR%%/Completion/Unix/_sed
 %%ZSH_FNDIR%%/Completion/Unix/_services
 %%ZSH_FNDIR%%/Completion/Unix/_sh
 %%ZSH_FNDIR%%/Completion/Unix/_showmount
 %%ZSH_FNDIR%%/Completion/Unix/_signals
 %%ZSH_FNDIR%%/Completion/Unix/_sisu
 %%ZSH_FNDIR%%/Completion/Unix/_slrn
 %%ZSH_FNDIR%%/Completion/Unix/_socket
+%%ZSH_FNDIR%%/Completion/Unix/_sort
 %%ZSH_FNDIR%%/Completion/Unix/_spamassassin
 %%ZSH_FNDIR%%/Completion/Unix/_sqsh
 %%ZSH_FNDIR%%/Completion/Unix/_ssh
+%%ZSH_FNDIR%%/Completion/Unix/_stgit
 %%ZSH_FNDIR%%/Completion/Unix/_strip
 %%ZSH_FNDIR%%/Completion/Unix/_stty
 %%ZSH_FNDIR%%/Completion/Unix/_su
 %%ZSH_FNDIR%%/Completion/Unix/_subversion
 %%ZSH_FNDIR%%/Completion/Unix/_sudo
 %%ZSH_FNDIR%%/Completion/Unix/_surfraw
 %%ZSH_FNDIR%%/Completion/Unix/_sysctl
 %%ZSH_FNDIR%%/Completion/Unix/_tar
 %%ZSH_FNDIR%%/Completion/Unix/_tar_archive
 %%ZSH_FNDIR%%/Completion/Unix/_tardy
+%%ZSH_FNDIR%%/Completion/Unix/_tcpdump
 %%ZSH_FNDIR%%/Completion/Unix/_tcptraceroute
 %%ZSH_FNDIR%%/Completion/Unix/_telnet
 %%ZSH_FNDIR%%/Completion/Unix/_terminals
 %%ZSH_FNDIR%%/Completion/Unix/_tex
 %%ZSH_FNDIR%%/Completion/Unix/_texi
 %%ZSH_FNDIR%%/Completion/Unix/_texinfo
 %%ZSH_FNDIR%%/Completion/Unix/_tidy
 %%ZSH_FNDIR%%/Completion/Unix/_tiff
 %%ZSH_FNDIR%%/Completion/Unix/_tilde_files
 %%ZSH_FNDIR%%/Completion/Unix/_time_zone
 %%ZSH_FNDIR%%/Completion/Unix/_tin
 %%ZSH_FNDIR%%/Completion/Unix/_tla
 %%ZSH_FNDIR%%/Completion/Unix/_todo.sh
 %%ZSH_FNDIR%%/Completion/Unix/_toilet
 %%ZSH_FNDIR%%/Completion/Unix/_totd
 %%ZSH_FNDIR%%/Completion/Unix/_tracepath
 %%ZSH_FNDIR%%/Completion/Unix/_twisted
 %%ZSH_FNDIR%%/Completion/Unix/_unace
 %%ZSH_FNDIR%%/Completion/Unix/_uname
 %%ZSH_FNDIR%%/Completion/Unix/_unexpand
 %%ZSH_FNDIR%%/Completion/Unix/_uniq
 %%ZSH_FNDIR%%/Completion/Unix/_units
 %%ZSH_FNDIR%%/Completion/Unix/_urls
 %%ZSH_FNDIR%%/Completion/Unix/_user_admin
 %%ZSH_FNDIR%%/Completion/Unix/_user_at_host
 %%ZSH_FNDIR%%/Completion/Unix/_users
 %%ZSH_FNDIR%%/Completion/Unix/_users_on
 %%ZSH_FNDIR%%/Completion/Unix/_vim
 %%ZSH_FNDIR%%/Completion/Unix/_vorbis
 %%ZSH_FNDIR%%/Completion/Unix/_vorbiscomment
 %%ZSH_FNDIR%%/Completion/Unix/_vux
 %%ZSH_FNDIR%%/Completion/Unix/_w3m
 %%ZSH_FNDIR%%/Completion/Unix/_webbrowser
 %%ZSH_FNDIR%%/Completion/Unix/_wget
 %%ZSH_FNDIR%%/Completion/Unix/_whereis
 %%ZSH_FNDIR%%/Completion/Unix/_whois
 %%ZSH_FNDIR%%/Completion/Unix/_wiggle
 %%ZSH_FNDIR%%/Completion/Unix/_xargs
 %%ZSH_FNDIR%%/Completion/Unix/_xmlsoft
 %%ZSH_FNDIR%%/Completion/Unix/_yafc
 %%ZSH_FNDIR%%/Completion/Unix/_yodl
 %%ZSH_FNDIR%%/Completion/Unix/_yp
 %%ZSH_FNDIR%%/Completion/Unix/_zcat
 %%ZSH_FNDIR%%/Completion/Unix/_zdump
+%%ZSH_FNDIR%%/Completion/Unix/_zfs
+%%ZSH_FNDIR%%/Completion/Unix/_zfs_dataset
+%%ZSH_FNDIR%%/Completion/Unix/_zfs_pool
 %%ZSH_FNDIR%%/Completion/Unix/_zip
+%%ZSH_FNDIR%%/Completion/Unix/_zpool
 %%ZSH_FNDIR%%/Completion/X/_acroread
 %%ZSH_FNDIR%%/Completion/X/_dcop
 %%ZSH_FNDIR%%/Completion/X/_gnome-gv
 %%ZSH_FNDIR%%/Completion/X/_gqview
 %%ZSH_FNDIR%%/Completion/X/_gv
 %%ZSH_FNDIR%%/Completion/X/_kfmclient
 %%ZSH_FNDIR%%/Completion/X/_mozilla
 %%ZSH_FNDIR%%/Completion/X/_mplayer
 %%ZSH_FNDIR%%/Completion/X/_nautilus
 %%ZSH_FNDIR%%/Completion/X/_nedit
 %%ZSH_FNDIR%%/Completion/X/_netscape
 %%ZSH_FNDIR%%/Completion/X/_qiv
 %%ZSH_FNDIR%%/Completion/X/_setxkbmap
 %%ZSH_FNDIR%%/Completion/X/_urxvt
 %%ZSH_FNDIR%%/Completion/X/_vnc
 %%ZSH_FNDIR%%/Completion/X/_x_arguments
 %%ZSH_FNDIR%%/Completion/X/_x_borderwidth
 %%ZSH_FNDIR%%/Completion/X/_x_color
 %%ZSH_FNDIR%%/Completion/X/_x_colormapid
 %%ZSH_FNDIR%%/Completion/X/_x_cursor
 %%ZSH_FNDIR%%/Completion/X/_x_display
 %%ZSH_FNDIR%%/Completion/X/_x_extension
 %%ZSH_FNDIR%%/Completion/X/_x_font
 %%ZSH_FNDIR%%/Completion/X/_x_geometry
 %%ZSH_FNDIR%%/Completion/X/_x_keysym
 %%ZSH_FNDIR%%/Completion/X/_x_locale
 %%ZSH_FNDIR%%/Completion/X/_x_modifier
 %%ZSH_FNDIR%%/Completion/X/_x_name
 %%ZSH_FNDIR%%/Completion/X/_x_resource
 %%ZSH_FNDIR%%/Completion/X/_x_selection_timeout
 %%ZSH_FNDIR%%/Completion/X/_x_title
 %%ZSH_FNDIR%%/Completion/X/_x_utils
 %%ZSH_FNDIR%%/Completion/X/_x_visual
 %%ZSH_FNDIR%%/Completion/X/_x_window
 %%ZSH_FNDIR%%/Completion/X/_xauth
 %%ZSH_FNDIR%%/Completion/X/_xdvi
 %%ZSH_FNDIR%%/Completion/X/_xfig
 %%ZSH_FNDIR%%/Completion/X/_xloadimage
 %%ZSH_FNDIR%%/Completion/X/_xmodmap
 %%ZSH_FNDIR%%/Completion/X/_xpdf
 %%ZSH_FNDIR%%/Completion/X/_xrandr
 %%ZSH_FNDIR%%/Completion/X/_xscreensaver
 %%ZSH_FNDIR%%/Completion/X/_xset
 %%ZSH_FNDIR%%/Completion/X/_xt_arguments
 %%ZSH_FNDIR%%/Completion/X/_xt_session_id
 %%ZSH_FNDIR%%/Completion/X/_xterm
 %%ZSH_FNDIR%%/Completion/X/_xv
 %%ZSH_FNDIR%%/Completion/X/_xwit
 %%ZSH_FNDIR%%/Completion/Zsh/_alias
 %%ZSH_FNDIR%%/Completion/Zsh/_aliases
 %%ZSH_FNDIR%%/Completion/Zsh/_arrays
 %%ZSH_FNDIR%%/Completion/Zsh/_assign
 %%ZSH_FNDIR%%/Completion/Zsh/_autocd
 %%ZSH_FNDIR%%/Completion/Zsh/_bindkey
 %%ZSH_FNDIR%%/Completion/Zsh/_brace_parameter
 %%ZSH_FNDIR%%/Completion/Zsh/_builtin
 %%ZSH_FNDIR%%/Completion/Zsh/_cd
 %%ZSH_FNDIR%%/Completion/Zsh/_command
 %%ZSH_FNDIR%%/Completion/Zsh/_command_names
 %%ZSH_FNDIR%%/Completion/Zsh/_compdef
 %%ZSH_FNDIR%%/Completion/Zsh/_condition
 %%ZSH_FNDIR%%/Completion/Zsh/_default
 %%ZSH_FNDIR%%/Completion/Zsh/_delimiters
 %%ZSH_FNDIR%%/Completion/Zsh/_directory_stack
 %%ZSH_FNDIR%%/Completion/Zsh/_dirs
 %%ZSH_FNDIR%%/Completion/Zsh/_disable
+%%ZSH_FNDIR%%/Completion/Zsh/_dynamic_directory_name
 %%ZSH_FNDIR%%/Completion/Zsh/_echotc
 %%ZSH_FNDIR%%/Completion/Zsh/_echoti
 %%ZSH_FNDIR%%/Completion/Zsh/_emulate
 %%ZSH_FNDIR%%/Completion/Zsh/_enable
 %%ZSH_FNDIR%%/Completion/Zsh/_equal
 %%ZSH_FNDIR%%/Completion/Zsh/_fc
 %%ZSH_FNDIR%%/Completion/Zsh/_file_descriptors
 %%ZSH_FNDIR%%/Completion/Zsh/_first
 %%ZSH_FNDIR%%/Completion/Zsh/_functions
 %%ZSH_FNDIR%%/Completion/Zsh/_globqual_delims
 %%ZSH_FNDIR%%/Completion/Zsh/_globquals
 %%ZSH_FNDIR%%/Completion/Zsh/_hash
 %%ZSH_FNDIR%%/Completion/Zsh/_history_modifiers
 %%ZSH_FNDIR%%/Completion/Zsh/_in_vared
 %%ZSH_FNDIR%%/Completion/Zsh/_jobs
 %%ZSH_FNDIR%%/Completion/Zsh/_jobs_bg
 %%ZSH_FNDIR%%/Completion/Zsh/_jobs_builtin
 %%ZSH_FNDIR%%/Completion/Zsh/_jobs_fg
 %%ZSH_FNDIR%%/Completion/Zsh/_kill
 %%ZSH_FNDIR%%/Completion/Zsh/_limit
 %%ZSH_FNDIR%%/Completion/Zsh/_limits
 %%ZSH_FNDIR%%/Completion/Zsh/_math
 %%ZSH_FNDIR%%/Completion/Zsh/_mere
 %%ZSH_FNDIR%%/Completion/Zsh/_options
 %%ZSH_FNDIR%%/Completion/Zsh/_options_set
 %%ZSH_FNDIR%%/Completion/Zsh/_options_unset
 %%ZSH_FNDIR%%/Completion/Zsh/_parameter
 %%ZSH_FNDIR%%/Completion/Zsh/_parameters
 %%ZSH_FNDIR%%/Completion/Zsh/_precommand
 %%ZSH_FNDIR%%/Completion/Zsh/_print
 %%ZSH_FNDIR%%/Completion/Zsh/_prompt
 %%ZSH_FNDIR%%/Completion/Zsh/_read
 %%ZSH_FNDIR%%/Completion/Zsh/_redirect
 %%ZSH_FNDIR%%/Completion/Zsh/_sched
 %%ZSH_FNDIR%%/Completion/Zsh/_set
 %%ZSH_FNDIR%%/Completion/Zsh/_setopt
 %%ZSH_FNDIR%%/Completion/Zsh/_source
 %%ZSH_FNDIR%%/Completion/Zsh/_stat
 %%ZSH_FNDIR%%/Completion/Zsh/_subscript
 %%ZSH_FNDIR%%/Completion/Zsh/_suffix_alias_files
+%%ZSH_FNDIR%%/Completion/Zsh/_tcpsys
 %%ZSH_FNDIR%%/Completion/Zsh/_tilde
 %%ZSH_FNDIR%%/Completion/Zsh/_trap
 %%ZSH_FNDIR%%/Completion/Zsh/_ttyctl
 %%ZSH_FNDIR%%/Completion/Zsh/_typeset
 %%ZSH_FNDIR%%/Completion/Zsh/_ulimit
 %%ZSH_FNDIR%%/Completion/Zsh/_unhash
 %%ZSH_FNDIR%%/Completion/Zsh/_unsetopt
 %%ZSH_FNDIR%%/Completion/Zsh/_value
 %%ZSH_FNDIR%%/Completion/Zsh/_vared
 %%ZSH_FNDIR%%/Completion/Zsh/_vars
 %%ZSH_FNDIR%%/Completion/Zsh/_wait
 %%ZSH_FNDIR%%/Completion/Zsh/_which
+%%ZSH_FNDIR%%/Completion/Zsh/_zcalc_line
 %%ZSH_FNDIR%%/Completion/Zsh/_zcompile
 %%ZSH_FNDIR%%/Completion/Zsh/_zed
 %%ZSH_FNDIR%%/Completion/Zsh/_zftp
 %%ZSH_FNDIR%%/Completion/Zsh/_zle
 %%ZSH_FNDIR%%/Completion/Zsh/_zmodload
 %%ZSH_FNDIR%%/Completion/Zsh/_zmv
 %%ZSH_FNDIR%%/Completion/Zsh/_zpty
 %%ZSH_FNDIR%%/Completion/Zsh/_zstyle
 %%ZSH_FNDIR%%/Completion/bashcompinit
 %%ZSH_FNDIR%%/Completion/compaudit
 %%ZSH_FNDIR%%/Completion/compdump
 %%ZSH_FNDIR%%/Completion/compinit
 %%ZSH_FNDIR%%/Completion/compinstall
 %%ZSH_FNDIR%%/Exceptions/catch
 %%ZSH_FNDIR%%/Exceptions/throw
 %%ZSH_FNDIR%%/MIME/pick-web-browser
 %%ZSH_FNDIR%%/MIME/zsh-mime-handler
 %%ZSH_FNDIR%%/MIME/zsh-mime-setup
 %%ZSH_FNDIR%%/Misc/add-zsh-hook
 %%ZSH_FNDIR%%/Misc/allopt
 %%ZSH_FNDIR%%/Misc/checkmail
 %%ZSH_FNDIR%%/Misc/colors
 %%ZSH_FNDIR%%/Misc/getjobs
 %%ZSH_FNDIR%%/Misc/harden
 %%ZSH_FNDIR%%/Misc/is-at-least
 %%ZSH_FNDIR%%/Misc/mere
 %%ZSH_FNDIR%%/Misc/nslookup
 %%ZSH_FNDIR%%/Misc/promptnl
 %%ZSH_FNDIR%%/Misc/relative
 %%ZSH_FNDIR%%/Misc/run-help
 %%ZSH_FNDIR%%/Misc/run-help-git
 %%ZSH_FNDIR%%/Misc/run-help-svk
 %%ZSH_FNDIR%%/Misc/run-help-svn
 %%ZSH_FNDIR%%/Misc/sticky-note
 %%ZSH_FNDIR%%/Misc/tetris
 %%ZSH_FNDIR%%/Misc/xtermctl
 %%ZSH_FNDIR%%/Misc/zargs
 %%ZSH_FNDIR%%/Misc/zcalc
 %%ZSH_FNDIR%%/Misc/zed
 %%ZSH_FNDIR%%/Misc/zkbd
 %%ZSH_FNDIR%%/Misc/zmathfuncdef
 %%ZSH_FNDIR%%/Misc/zmv
 %%ZSH_FNDIR%%/Misc/zrecompile
 %%ZSH_FNDIR%%/Misc/zstyle+
 %%ZSH_FNDIR%%/Newuser/zsh-newuser-install
 %%ZSH_FNDIR%%/Prompts/prompt_adam1_setup
 %%ZSH_FNDIR%%/Prompts/prompt_adam2_setup
 %%ZSH_FNDIR%%/Prompts/prompt_bart_setup
 %%ZSH_FNDIR%%/Prompts/prompt_bigfade_setup
 %%ZSH_FNDIR%%/Prompts/prompt_clint_setup
 %%ZSH_FNDIR%%/Prompts/prompt_elite2_setup
 %%ZSH_FNDIR%%/Prompts/prompt_elite_setup
 %%ZSH_FNDIR%%/Prompts/prompt_fade_setup
 %%ZSH_FNDIR%%/Prompts/prompt_fire_setup
 %%ZSH_FNDIR%%/Prompts/prompt_off_setup
 %%ZSH_FNDIR%%/Prompts/prompt_oliver_setup
+%%ZSH_FNDIR%%/Prompts/prompt_pws_setup
 %%ZSH_FNDIR%%/Prompts/prompt_redhat_setup
 %%ZSH_FNDIR%%/Prompts/prompt_special_chars
 %%ZSH_FNDIR%%/Prompts/prompt_suse_setup
 %%ZSH_FNDIR%%/Prompts/prompt_walters_setup
 %%ZSH_FNDIR%%/Prompts/prompt_zefram_setup
 %%ZSH_FNDIR%%/Prompts/promptinit
 %%ZSH_FNDIR%%/TCP/tcp_alias
 %%ZSH_FNDIR%%/TCP/tcp_close
 %%ZSH_FNDIR%%/TCP/tcp_command
 %%ZSH_FNDIR%%/TCP/tcp_expect
 %%ZSH_FNDIR%%/TCP/tcp_fd_handler
 %%ZSH_FNDIR%%/TCP/tcp_log
 %%ZSH_FNDIR%%/TCP/tcp_open
 %%ZSH_FNDIR%%/TCP/tcp_output
 %%ZSH_FNDIR%%/TCP/tcp_point
 %%ZSH_FNDIR%%/TCP/tcp_proxy
 %%ZSH_FNDIR%%/TCP/tcp_read
 %%ZSH_FNDIR%%/TCP/tcp_rename
 %%ZSH_FNDIR%%/TCP/tcp_send
 %%ZSH_FNDIR%%/TCP/tcp_sess
 %%ZSH_FNDIR%%/TCP/tcp_shoot
 %%ZSH_FNDIR%%/TCP/tcp_spam
 %%ZSH_FNDIR%%/TCP/tcp_talk
 %%ZSH_FNDIR%%/TCP/tcp_wait
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_bzr
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_cdv
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_cvs
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_darcs
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_git
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_hg
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_mtn
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_p4
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_svk
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_svn
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_tla
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_bzr
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_cdv
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_cvs
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_darcs
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_git
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_hg
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_mtn
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_p4
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_svk
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_svn
+%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_tla
+%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_adjust
+%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_bydir_detect
+%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_check_com
+%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_formats
+%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_maxexports
+%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_nvcsformats
+%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_realpath
+%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_reposub
+%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_set
+%%ZSH_FNDIR%%/VCS_Info/vcs_info
+%%ZSH_FNDIR%%/VCS_Info/vcs_info_lastmsg
+%%ZSH_FNDIR%%/VCS_Info/vcs_info_printsys
+%%ZSH_FNDIR%%/VCS_Info/vcs_info_setsys
 %%ZSH_FNDIR%%/Zftp/zfanon
 %%ZSH_FNDIR%%/Zftp/zfautocheck
 %%ZSH_FNDIR%%/Zftp/zfcd
 %%ZSH_FNDIR%%/Zftp/zfcd_match
 %%ZSH_FNDIR%%/Zftp/zfcget
 %%ZSH_FNDIR%%/Zftp/zfclose
 %%ZSH_FNDIR%%/Zftp/zfcput
 %%ZSH_FNDIR%%/Zftp/zfdir
 %%ZSH_FNDIR%%/Zftp/zffcache
 %%ZSH_FNDIR%%/Zftp/zfgcp
 %%ZSH_FNDIR%%/Zftp/zfget
 %%ZSH_FNDIR%%/Zftp/zfget_match
 %%ZSH_FNDIR%%/Zftp/zfgoto
 %%ZSH_FNDIR%%/Zftp/zfhere
 %%ZSH_FNDIR%%/Zftp/zfinit
 %%ZSH_FNDIR%%/Zftp/zfls
 %%ZSH_FNDIR%%/Zftp/zfmark
 %%ZSH_FNDIR%%/Zftp/zfopen
 %%ZSH_FNDIR%%/Zftp/zfparams
 %%ZSH_FNDIR%%/Zftp/zfpcp
 %%ZSH_FNDIR%%/Zftp/zfput
 %%ZSH_FNDIR%%/Zftp/zfrglob
 %%ZSH_FNDIR%%/Zftp/zfrtime
 %%ZSH_FNDIR%%/Zftp/zfsession
 %%ZSH_FNDIR%%/Zftp/zfstat
 %%ZSH_FNDIR%%/Zftp/zftp_chpwd
 %%ZSH_FNDIR%%/Zftp/zftp_progress
 %%ZSH_FNDIR%%/Zftp/zftransfer
 %%ZSH_FNDIR%%/Zftp/zftype
 %%ZSH_FNDIR%%/Zftp/zfuget
 %%ZSH_FNDIR%%/Zftp/zfuput
 %%ZSH_FNDIR%%/Zle/backward-kill-word-match
 %%ZSH_FNDIR%%/Zle/backward-word-match
 %%ZSH_FNDIR%%/Zle/capitalize-word-match
 %%ZSH_FNDIR%%/Zle/copy-earlier-word
 %%ZSH_FNDIR%%/Zle/cycle-completion-positions
 %%ZSH_FNDIR%%/Zle/define-composed-chars
 %%ZSH_FNDIR%%/Zle/delete-whole-word-match
 %%ZSH_FNDIR%%/Zle/down-case-word-match
 %%ZSH_FNDIR%%/Zle/down-line-or-beginning-search
 %%ZSH_FNDIR%%/Zle/edit-command-line
 %%ZSH_FNDIR%%/Zle/forward-word-match
 %%ZSH_FNDIR%%/Zle/history-beginning-search-menu
 %%ZSH_FNDIR%%/Zle/history-pattern-search
 %%ZSH_FNDIR%%/Zle/history-search-end
 %%ZSH_FNDIR%%/Zle/incarg
 %%ZSH_FNDIR%%/Zle/incremental-complete-word
 %%ZSH_FNDIR%%/Zle/insert-composed-char
 %%ZSH_FNDIR%%/Zle/insert-files
 %%ZSH_FNDIR%%/Zle/insert-unicode-char
 %%ZSH_FNDIR%%/Zle/keeper
 %%ZSH_FNDIR%%/Zle/keymap+widget
 %%ZSH_FNDIR%%/Zle/kill-word-match
 %%ZSH_FNDIR%%/Zle/match-word-context
 %%ZSH_FNDIR%%/Zle/match-words-by-style
 %%ZSH_FNDIR%%/Zle/modify-current-argument
 %%ZSH_FNDIR%%/Zle/narrow-to-region
 %%ZSH_FNDIR%%/Zle/narrow-to-region-invisible
 %%ZSH_FNDIR%%/Zle/predict-on
 %%ZSH_FNDIR%%/Zle/quote-and-complete-word
 %%ZSH_FNDIR%%/Zle/read-from-minibuffer
 %%ZSH_FNDIR%%/Zle/replace-string
 %%ZSH_FNDIR%%/Zle/replace-string-again
 %%ZSH_FNDIR%%/Zle/select-word-style
 %%ZSH_FNDIR%%/Zle/smart-insert-last-word
 %%ZSH_FNDIR%%/Zle/split-shell-arguments
 %%ZSH_FNDIR%%/Zle/transpose-words-match
 %%ZSH_FNDIR%%/Zle/up-case-word-match
 %%ZSH_FNDIR%%/Zle/up-line-or-beginning-search
 %%ZSH_FNDIR%%/Zle/url-quote-magic
 %%ZSH_FNDIR%%/Zle/which-command
 %%ZSH_FNDIR%%/Zle/zed-set-file-name
 %%DATADIR%%/%%ZSH_VER%%/scripts/newuser
-@dirrm %%ZSH_FNDIR%%/Calendar
-@dirrm %%ZSH_FNDIR%%/Completion/AIX
-@dirrm %%ZSH_FNDIR%%/Completion/BSD
-@dirrm %%ZSH_FNDIR%%/Completion/Base
-@dirrm %%ZSH_FNDIR%%/Completion/Cygwin
-@dirrm %%ZSH_FNDIR%%/Completion/Darwin
-@dirrm %%ZSH_FNDIR%%/Completion/Debian
-@dirrm %%ZSH_FNDIR%%/Completion/Linux
-@dirrm %%ZSH_FNDIR%%/Completion/Mandriva
-@dirrm %%ZSH_FNDIR%%/Completion/Redhat
-@dirrm %%ZSH_FNDIR%%/Completion/Unix
-@dirrm %%ZSH_FNDIR%%/Completion/X
+@dirrm %%ZSH_FNDIR%%/Zle
+@dirrm %%ZSH_FNDIR%%/Zftp
+@dirrm %%ZSH_FNDIR%%/VCS_Info/Backends
+@dirrm %%ZSH_FNDIR%%/VCS_Info
+@dirrm %%ZSH_FNDIR%%/TCP
+@dirrm %%ZSH_FNDIR%%/Prompts
+@dirrm %%ZSH_FNDIR%%/Newuser
+@dirrm %%ZSH_FNDIR%%/Misc
+@dirrm %%ZSH_FNDIR%%/MIME
+@dirrm %%ZSH_FNDIR%%/Exceptions
 @dirrm %%ZSH_FNDIR%%/Completion/Zsh
+@dirrm %%ZSH_FNDIR%%/Completion/X
+@dirrm %%ZSH_FNDIR%%/Completion/Unix
+@dirrm %%ZSH_FNDIR%%/Completion/Redhat
+@dirrm %%ZSH_FNDIR%%/Completion/Mandriva
+@dirrm %%ZSH_FNDIR%%/Completion/Linux
+@dirrm %%ZSH_FNDIR%%/Completion/Debian
+@dirrm %%ZSH_FNDIR%%/Completion/Darwin
+@dirrm %%ZSH_FNDIR%%/Completion/Cygwin
+@dirrm %%ZSH_FNDIR%%/Completion/Base
+@dirrm %%ZSH_FNDIR%%/Completion/BSD
+@dirrm %%ZSH_FNDIR%%/Completion/AIX
 @dirrm %%ZSH_FNDIR%%/Completion
-@dirrm %%ZSH_FNDIR%%/Exceptions
-@dirrm %%ZSH_FNDIR%%/MIME
-@dirrm %%ZSH_FNDIR%%/Misc
-@dirrm %%ZSH_FNDIR%%/Newuser
-@dirrm %%ZSH_FNDIR%%/Prompts
-@dirrm %%ZSH_FNDIR%%/TCP
-@dirrm %%ZSH_FNDIR%%/Zftp
-@dirrm %%ZSH_FNDIR%%/Zle
+@dirrm %%ZSH_FNDIR%%/Calendar
 @dirrm %%ZSH_FNDIR%%
 @dirrm %%DATADIR%%/%%ZSH_VER%%/scripts
 @dirrm %%DATADIR%%/%%ZSH_VER%%
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%