diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index bbe3bf2938b8..145cb714c9e5 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	zsh
 PORTVERSION=	5.0.7
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc
@@ -101,7 +102,7 @@ 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 > \
+	cd ${WRKSRC} && ${SOELIM} -r ${WRKSRC}/Doc/zshall.1.source > \
 		${WRKSRC}/Doc/zshall.1
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/info
diff --git a/shells/zsh/files/patch-Completion_BSD_Command___kld b/shells/zsh/files/patch-Completion_BSD_Command___kld
new file mode 100644
index 000000000000..7a49642520dc
--- /dev/null
+++ b/shells/zsh/files/patch-Completion_BSD_Command___kld
@@ -0,0 +1,11 @@
+--- Completion/BSD/Command/_kld.orig	2013-11-27 19:00:18 UTC
++++ Completion/BSD/Command/_kld
+@@ -4,7 +4,7 @@
+ _kld_module() {
+   local ret=1
+ 
+-  compadd "$@" - /boot/kernel/*.ko(-.:t) /modules/*.ko(-.:t) && ret=0
++  compadd "$@" - /boot/{kernel,modules}/*.ko(-.:t) && ret=0
+   _files "$@" -g '*.ko(-.)' && ret=0
+ 
+   return ret
diff --git a/shells/zsh/files/patch-Doc_zshmodules.1 b/shells/zsh/files/patch-Doc_zshmodules.1
new file mode 100644
index 000000000000..d7e839541ae8
--- /dev/null
+++ b/shells/zsh/files/patch-Doc_zshmodules.1
@@ -0,0 +1,10 @@
+--- Doc/zshmodules.1.orig	2014-11-21 22:50:41 UTC
++++ Doc/zshmodules.1
+@@ -2415,7 +2415,6 @@ Returns the process ID of the current pr
+ Returns the process ID of the parent of the current process, even in
+ subshells\&.  Compare \fB$PPID\fP, which returns the process ID of the parent
+ of the main shell process\&.
+-.RE
+ .SH "THE ZSH/NET/TCP MODULE"
+ .\" Yodl file: Zsh/mod_tcp.yo
+