diff --git a/app-shells/zsh/patches/zsh-4.3.10.patch b/app-shells/zsh/patches/zsh-4.3.10.patch
deleted file mode 100644
index 256e8b9ba..000000000
--- a/app-shells/zsh/patches/zsh-4.3.10.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur zsh-4.3.10/Functions/Newuser/zsh-newuser-install zsh-4.3.10.haiku/Functions/Newuser/zsh-newuser-install
---- zsh-4.3.10/Functions/Newuser/zsh-newuser-install	2008-07-18 11:46:20.056885248 +0000
-+++ zsh-4.3.10.haiku/Functions/Newuser/zsh-newuser-install	2010-08-18 10:40:15.840957952 +0000
-@@ -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
- 
- # The directory in which to look for and save .zshrc.
- local zd=${ZDOTDIR:-$HOME}
-diff -Naur zsh-4.3.10/config.guess zsh-4.3.10.haiku/config.guess
---- zsh-4.3.10/config.guess	2006-11-14 12:11:33.053477376 +0000
-+++ zsh-4.3.10.haiku/config.guess	2010-08-17 13:50:09.018350080 +0000
-@@ -1199,6 +1199,9 @@
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
- 	exit ;;
-+    BePC:Haiku:*:*)	# Haiku OS running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
- 	exit ;;
-diff -Naur zsh-4.3.10/configure.ac zsh-4.3.10.haiku/configure.ac
---- zsh-4.3.10/configure.ac	2009-06-01 09:03:35.044564480 +0000
-+++ zsh-4.3.10.haiku/configure.ac	2010-08-18 10:30:31.476053504 +0000
-@@ -762,8 +762,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 --git a/app-shells/zsh/patches/zsh-5.0.2.patchset b/app-shells/zsh/patches/zsh-5.0.2.patchset
new file mode 100644
index 000000000..4b1e321b2
--- /dev/null
+++ b/app-shells/zsh/patches/zsh-5.0.2.patchset
@@ -0,0 +1,22 @@
+From e436d167eae648e23d576cea10900eba7228271d Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Wed, 18 Sep 2013 03:11:28 -0600
+Subject: Fix for gcc2
+
+
+diff --git a/Src/params.c b/Src/params.c
+index 8649178..3904ed0 100644
+--- a/Src/params.c
++++ b/Src/params.c
+@@ -4310,7 +4310,7 @@ arrfixenv(char *s, char **t)
+ int
+ zputenv(char *str)
+ {
+-    DPUTS(!str, "Attempt to put null string into environment.");
++    //DPUTS(!str, "Attempt to put null string into environment.");
+ #ifdef USE_SET_UNSET_ENV
+     /*
+      * If we are using unsetenv() to remove values from the
+-- 
+1.8.3.4
+
diff --git a/app-shells/zsh/zsh-4.3.10.recipe b/app-shells/zsh/zsh-4.3.10.recipe
deleted file mode 100644
index 8fc1a7402..000000000
--- a/app-shells/zsh/zsh-4.3.10.recipe
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="Zsh is a shell designed for interactive use, although it is also a powerful scripting language." 
-HOMEPAGE="http://www.zsh.org" 
-SRC_URI="http://sourceforge.net/projects/zsh/files/zsh-dev/4.3.10/zsh-4.3.10.tar.bz2/download"
-REVISION="1"
-CHECKSUM_MD5="74c5b275544400082a1cde806c98682a"
-STATUS_HAIKU="unstable"
-DEPEND=""
-BUILD()
-{
-	cd zsh-4.3.10
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd zsh-4.3.10
-	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.2.recipe
new file mode 100644
index 000000000..95f01ab0e
--- /dev/null
+++ b/app-shells/zsh/zsh-5.0.2.recipe
@@ -0,0 +1,50 @@
+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"
+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_MD5="b8f2ad691acf58b3252225746480dcad"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+PATCHES="zsh-5.0.2.patchset"
+PROVIDES="
+	zsh = $portVersion compat >= 5
+	cmd:zsh = $portVersion compat >= 5
+	cmd:zsh_$portVersion = $portVersion compat >= 5
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libncurses
+	lib:libpcre
+	"
+BUILD_REQUIRES="
+	devel:libncurses
+	devel:libpcre
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:find
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+}