diff --git a/net-libs/zeromq/patches/zeromq-4.2.2.patchset b/net-libs/zeromq/patches/zeromq-4.2.2.patchset
deleted file mode 100644
index ce4e41f28..000000000
--- a/net-libs/zeromq/patches/zeromq-4.2.2.patchset
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2784f887cccb13ca3ae689ad0319c6c698f67ad3 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Tue, 18 Apr 2017 21:52:36 +0200
-Subject: Haiku patch
-
-
-diff --git a/configure.ac b/configure.ac
-index 0f19396..69723da 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -213,6 +213,10 @@ case "${host_os}" in
-         LIBZMQ_CHECK_LANG_FLAG_PREPEND([-Wno-uninitialized])
-         AC_LANG_POP([C++])
-         ;;
-+    *haiku*)
-+        AC_DEFINE(ZMQ_HAVE_HAIKU, 1, [Have Haiku OS])
-+        AC_CHECK_LIB(network, socket)
-+        ;;
-     *netbsd*)
-         # Define on NetBSD to enable all library features
-         CPPFLAGS="-D_NETBSD_SOURCE $CPPFLAGS"
--- 
-2.14.2
-
diff --git a/net-libs/zeromq/zeromq-4.2.2.recipe b/net-libs/zeromq/zeromq-4.2.3.recipe
similarity index 56%
rename from net-libs/zeromq/zeromq-4.2.2.recipe
rename to net-libs/zeromq/zeromq-4.2.3.recipe
index bad59e90a..cd7e14289 100644
--- a/net-libs/zeromq/zeromq-4.2.2.recipe
+++ b/net-libs/zeromq/zeromq-4.2.3.recipe
@@ -7,29 +7,38 @@ message filtering (subscriptions), seamless access to multiple transport \
 protocols and more."
 HOMEPAGE="http://www.zeromq.org/"
 COPYRIGHT="2007-2014 iMatix Corporation
-2009-2011 250bpm s.r.o.
-2010-2011 Miru Limited
-2011 VMware, Inc.
-2012 Spotify AB
-2013 Ericsson AB
-2014 AppDynamics Inc.
-2015-2016 Brocade Communications Systems Inc.
-"
+	2009-2011 250bpm s.r.o.
+	2010-2011 Miru Limited
+	2011 VMware, Inc.
+	2012 Spotify AB
+	2013 Ericsson AB
+	2014 AppDynamics Inc.
+	2015 Google, Inc.
+	2015-2016 Brocade Communications Systems Inc."
 LICENSE="GNU LGPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/zeromq/libzmq/releases/download/v$portVersion/zeromq-$portVersion.tar.gz"
-CHECKSUM_SHA256="5b23f4ca9ef545d5bd3af55d305765e3ee06b986263b31967435d285a3e6df6b"
-SOURCE_URI_2="https://raw.githubusercontent.com/zeromq/cppzmq/b0e6d4b/zmq.hpp#noarchive"
-CHECKSUM_SHA256_2="02b73219656df3ffe3b231c7d0326e754a738ef2a83c8e94cd1e47d22cdd9535"
-PATCHES="zeromq-$portVersion.patchset"
+CHECKSUM_SHA256="8f1e2b2aade4dbfde98d82366d61baef2f62e812530160d2e6d0a5bb24e40bc0"
+SOURCE_URI_2="https://raw.githubusercontent.com/zeromq/cppzmq/a604af9/zmq.hpp#noarchive"
+CHECKSUM_SHA256_2="cc9258ac55ccf3e53594d0c0c154ac089a08a11d1f3e1d52e6acc8c6a71eef69"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="5.1.3"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	zeromq$secondaryArchSuffix = $portVersion
-	cmd:curve_keygen$secondaryArchSuffix
-	lib:libzmq$secondaryArchSuffix = 5.1.2 compat >= 5
+	cmd:curve_keygen$commandSuffix
+	lib:libzmq$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -37,7 +46,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	zeromq${secondaryArchSuffix}_devel = $portVersion
-	devel:libzmq$secondaryArchSuffix = 5.1.2 compat >= 5
+	devel:libzmq$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	zeromq$secondaryArchSuffix == $portVersion base
@@ -56,10 +65,14 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage zeromq$secondaryArchSuffix \
+	"$commandBinDir"/curve_keygen \
+	"$libDir"/libzmq.so.$libVersion
+
 BUILD()
 {
 	autoreconf -fi
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir"
 	make $jobArgs
 }