diff --git a/app-shells/zsh/patches/zsh-5.0.0.patch b/app-shells/zsh/patches/zsh-5.0.0.patch
deleted file mode 100644
index 2d984f9a0..000000000
--- a/app-shells/zsh/patches/zsh-5.0.0.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -aur zsh-5.0.0.org/configure.ac zsh-5.0.0/configure.ac
---- zsh-5.0.0.org/configure.ac	2012-06-21 20:36:03.034865152 +0200
-+++ zsh-5.0.0/configure.ac	2012-11-04 20:38:45.770703360 +0100
-@@ -796,8 +796,8 @@
-   AC_CHECK_LIB(cap, cap_get_proc)
- fi
- 
--AC_CHECK_LIB(socket, socket)
--AC_SEARCH_LIBS(gethostbyname2, bind)
-+AC_SEARCH_LIBS(socket, socket network)
-+AC_SEARCH_LIBS(gethostbyname2, bind network)
- 
- case $LIBS in
-   *-lbind*)
-diff -aur zsh-5.0.0.org/Functions/Newuser/zsh-newuser-install zsh-5.0.0/Functions/Newuser/zsh-newuser-install
---- zsh-5.0.0.org/Functions/Newuser/zsh-newuser-install	2010-08-12 21:09:05.037224448 +0200
-+++ zsh-5.0.0/Functions/Newuser/zsh-newuser-install	2012-11-04 20:37:13.598736896 +0100
-@@ -10,14 +10,17 @@
- # How the function will be referred to.
- local myname=zsh-newuser-install
- 
--# Quick test not requiring any setting up.
--# Don't run if we're root.  (These variables are provided by the shell.)
--if (( EUID == 0 || UID == 0 )); then
--  if [[ $1 = -f ]]; then
--    print -r "$myname: won't run as root.  Read the manual." >&2
--  fi
--  return 1
--fi
-+# Haiku OS specific: We want to perform newuser configuration for 
-+# zero UID too! ;-) So we have to disable it by patch.
-+##
-+## Quick test not requiring any setting up.
-+## Don't run if we're root.  (These variables are provided by the shell.)
-+#if (( EUID == 0 || UID == 0 )); then
-+#  if [[ $1 = -f ]]; then
-+#    print -r "$myname: won't run as root.  Read the manual." >&2
-+#  fi
-+#  return 1
-+#fi
- 
- # clear is missing in some Cygwin configurations (lacking ncurses)
- if ! ( clear >/dev/null 2>/dev/null ); then
-diff -aur zsh-5.0.0.org/Src/prototypes.h zsh-5.0.0/Src/prototypes.h
---- zsh-5.0.0.org/Src/prototypes.h	2011-05-03 20:38:21.027000832 +0200
-+++ zsh-5.0.0/Src/prototypes.h	2012-11-04 21:07:23.734789632 +0100
-@@ -40,7 +40,7 @@
-  * TBD: we'd much prefer to get hold of the header where
-  * these are defined.
-  */
--#ifdef _AIX
-+#if defined(_AIX) || defined(__HAIKU__)
- #define TC_CONST const
- #else
- #define TC_CONST
diff --git a/app-shells/zsh/patches/zsh-5.0.2.patchset b/app-shells/zsh/patches/zsh-5.0.7.patchset
similarity index 100%
rename from app-shells/zsh/patches/zsh-5.0.2.patchset
rename to app-shells/zsh/patches/zsh-5.0.7.patchset
diff --git a/app-shells/zsh/zsh-5.0.0.recipe b/app-shells/zsh/zsh-5.0.0.recipe
deleted file mode 100644
index aee26c8ea..000000000
--- a/app-shells/zsh/zsh-5.0.0.recipe
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY="Zsh is a UNIX command interpreter (shell)"
-DESCRIPTION="
-Zsh is a shell designed for interactive use, although it is also a powerful \
-scripting language. Many of the useful features of bash, ksh, and tcsh were \
-incorporated into zsh; many original features were added.
-"
-HOMEPAGE="http://www.zsh.org"
-SRC_URI="http://sourceforge.net/projects/zsh/files/zsh/5.0.0/zsh-5.0.0.tar.bz2/download"
-REVISION="1"
-CHECKSUM_MD5="e8484468925cec8d9a84b8b04797e764"
-STATUS_HAIKU="unstable"
-DEPEND=""
-BUILD()
-{
-	cd zsh-5.0.0
-	autoconf
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-				--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-				--mandir=$COMMON_DOCS/man \
-				--infodir=$COMMON_DOCS/info \
-				LIBS="-lgnu"
-	make
-}
-
-INSTALL()
-{
-	cd zsh-5.0.0
-	make install
-}
-LICENSE="ZSH"
-COPYRIGHT="(c) 1992-2009 Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wishnowsky, and others."
diff --git a/app-shells/zsh/zsh-5.0.2.recipe b/app-shells/zsh/zsh-5.0.7.recipe
similarity index 53%
rename from app-shells/zsh/zsh-5.0.2.recipe
rename to app-shells/zsh/zsh-5.0.7.recipe
index 52d42993f..ae2746eb2 100644
--- a/app-shells/zsh/zsh-5.0.2.recipe
+++ b/app-shells/zsh/zsh-5.0.7.recipe
@@ -1,21 +1,21 @@
 SUMMARY="Zsh is a UNIX command interpreter (shell)"
-DESCRIPTION="
-Zsh is a shell designed for interactive use, although it is also a powerful \
-scripting language. Many of the useful features of bash, ksh, and tcsh were \
-incorporated into zsh; many original features were added.
-"
+DESCRIPTION="Zsh is a shell designed for interactive use, although it \
+is also a powerful scripting language. Many of the useful features of \
+bash, ksh, and tcsh were incorporated into zsh; many original features \
+were added."
 HOMEPAGE="http://www.zsh.org"
 LICENSE="ZSH"
-COPYRIGHT="1992-2013, Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wishnowsky, and others."
-SRC_URI="http://sourceforge.net/projects/zsh/files/zsh/5.0.2/zsh-5.0.2.tar.bz2"
-CHECKSUM_SHA256="eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03"
+COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wishnowsky, and others."
+SRC_URI="http://sourceforge.net/projects/zsh/files/zsh/$portVersion/zsh-$portVersion.tar.bz2"
+CHECKSUM_SHA256="544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
-PATCHES="zsh-5.0.2.patchset"
+PATCHES="zsh-$portVersion.patchset"
 PROVIDES="
 	zsh = $portVersion compat >= 5
 	cmd:zsh = $portVersion compat >= 5
 	cmd:zsh_$portVersion = $portVersion compat >= 5
+	cmd:sh
 	"
 REQUIRES="
 	haiku
@@ -38,12 +38,13 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	runConfigure ./configure
-	make
+	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
+	ln -s zsh $binDir/sh
 }
 
 TEST()