diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 6bab7575a2d..97ae625c402 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.45 2008/02/08 04:55:08 okan Exp $
+# $OpenBSD: Makefile,v 1.46 2008/03/26 16:45:43 landry Exp $
 
 COMMENT=	Z shell, Bourne shell-compatible
 
 V=		4.3.5
 DISTNAME=	zsh-$V
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	shells
 
 MAINTAINER=	Pierre-Emmanuel Andre <pea@raveland.org>
diff --git a/shells/zsh/patches/patch-Completion_Unix_Type__canonical_paths b/shells/zsh/patches/patch-Completion_Unix_Type__canonical_paths
new file mode 100644
index 00000000000..23060cddfb0
--- /dev/null
+++ b/shells/zsh/patches/patch-Completion_Unix_Type__canonical_paths
@@ -0,0 +1,21 @@
+$OpenBSD: patch-Completion_Unix_Type__canonical_paths,v 1.1 2008/03/26 16:45:43 landry Exp $
+--- Completion/Unix/Type/_canonical_paths.orig	Wed Mar 26 13:36:46 2008
++++ Completion/Unix/Type/_canonical_paths	Wed Mar 26 13:37:32 2008
+@@ -38,7 +38,7 @@ if (( $__opts[(I)-N] )); then
+   files=($@)
+ else
+   for __index in $@; do
+-    files+=$(readlink -qf $__index)
++    files+=$(readlink -f $__index)
+   done
+ fi
+ 
+@@ -48,7 +48,7 @@ _canonical_paths_add_paths () {
+   expref=${~origpref}
+   [[ $origpref == (|*/). ]] && rltrim=.
+   curpref=${${expref%$rltrim}:-./}
+-  canpref=$(readlink -qf $curpref)
++  canpref=$(readlink -f $curpref)
+   if [[ $? -eq 0 ]]; then
+     [[ $curpref == */ && $canpref == *[^/] ]] && canpref+=/
+     canpref+=$rltrim
diff --git a/shells/zsh/pkg/PLIST b/shells/zsh/pkg/PLIST
index 5a6289f78a0..89a8c16986b 100644
--- a/shells/zsh/pkg/PLIST
+++ b/shells/zsh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.22 2008/02/08 04:55:08 okan Exp $
+@comment $OpenBSD: PLIST,v 1.23 2008/03/26 16:45:43 landry Exp $
 @pkgpath shells/zsh,-main
 @shell bin/zsh
 %%SHARED%%
@@ -78,6 +78,7 @@ share/zsh/${V}/functions/_cal
 share/zsh/${V}/functions/_call_function
 share/zsh/${V}/functions/_call_program
 share/zsh/${V}/functions/_canonical_paths
+@comment share/zsh/${V}/functions/_canonical_paths.orig
 share/zsh/${V}/functions/_ccal
 share/zsh/${V}/functions/_cd
 share/zsh/${V}/functions/_cdbs-edit-patch