diff --git a/app-shells/zsh/patches/zsh-5.0.7.patchset b/app-shells/zsh/patches/zsh-5.0.7.patchset
index 4b1e321b2..3cd03a8da 100644
--- a/app-shells/zsh/patches/zsh-5.0.7.patchset
+++ b/app-shells/zsh/patches/zsh-5.0.7.patchset
@@ -3,12 +3,11 @@ 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
+index 61edc5d..57e1e8d 100644
 --- a/Src/params.c
 +++ b/Src/params.c
-@@ -4310,7 +4310,7 @@ arrfixenv(char *s, char **t)
+@@ -4356,7 +4356,7 @@ arrfixenv(char *s, char **t)
  int
  zputenv(char *str)
  {
@@ -17,6 +16,25 @@ index 8649178..3904ed0 100644
  #ifdef USE_SET_UNSET_ENV
      /*
       * If we are using unsetenv() to remove values from the
--- 
-1.8.3.4
-
+diff --git a/configure.ac b/configure.ac
+index 306a005..1dac756 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -752,7 +752,7 @@ dnl On ReliantUNIX -lc better be the last library, else funny things
+ dnl may happen.
+ AC_CHECK_LIB(c, printf, [LIBS="$LIBS -lc"])
+ 
+-AC_CHECK_LIB(m, pow)
++AC_CHECK_LIB(root, pow)
+ 
+ AC_CHECK_LIB(rt, clock_gettime)
+ 
+@@ -857,7 +857,7 @@ if test x$enable_cap = xyes; then
+   AC_CHECK_LIB(cap, cap_get_proc)
+ fi
+ 
+-AC_CHECK_LIB(socket, socket)
++AC_CHECK_LIB(network, socket)
+ AC_SEARCH_LIBS(gethostbyname2, bind)
+ 
+ case $LIBS in
diff --git a/app-shells/zsh/zsh-5.0.7.recipe b/app-shells/zsh/zsh-5.0.7.recipe
index c9326f56c..ff8d3ce55 100644
--- a/app-shells/zsh/zsh-5.0.7.recipe
+++ b/app-shells/zsh/zsh-5.0.7.recipe
@@ -7,41 +7,48 @@ HOMEPAGE="http://www.zsh.org"
 COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
 Andrew Main, Peter Stephenson, Sven Wishnowsky, and others"
 LICENSE="ZSH"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://sourceforge.net/projects/zsh/files/zsh/$portVersion/zsh-$portVersion.tar.bz2"
 CHECKSUM_SHA256="544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3"
 PATCHES="zsh-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	zsh = $portVersion compat >= 5
-	cmd:zsh = $portVersion compat >= 5
-	cmd:zsh_$portVersion = $portVersion compat >= 5
-	cmd:sh
+	zsh$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:zsh$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:zsh_$portVersion$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:sh$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku
-	lib:libncurses
-	lib:libpcre
+	haiku$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libncurses
-	devel:libpcre
+	haiku${secondaryArchSuffix}_devel
+	devel:libncurses$secondaryArchSuffix
+	devel:libpcre$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:find
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:ld
 	cmd:make
 	"
 
 BUILD()
 {
-	runConfigure ./configure
+	autoreconf -fi
+	runConfigure ./configure \
+		--enable-zshrc=`finddir B_USER_SETTINGS_DIRECTORY`/zsh/.zshrc \
+		--sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/zsh \
+		--enable-etcdir=`finddir B_USER_SETTINGS_DIRECTORY`/zsh
 	make $jobArgs
 }