diff --git a/srcpkgs/xbps/patches/11e5190a.patch b/srcpkgs/xbps/patches/11e5190a.patch
new file mode 100644
index 00000000000..c74001fdf7f
--- /dev/null
+++ b/srcpkgs/xbps/patches/11e5190a.patch
@@ -0,0 +1,34 @@
+From 11e5190a36972ced2c0c79da9d6c00ecdbd75bfa Mon Sep 17 00:00:00 2001
+From: Johannes Brechtmann <johannes@jnbr.me>
+Date: Sat, 22 Jun 2019 16:40:49 +0200
+Subject: [PATCH] lib/fetch: happy_eyeballs_connect check for waiting
+ connections before decrementing them, remove dead code
+
+---
+ lib/fetch/common.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/lib/fetch/common.c b/lib/fetch/common.c
+index df7f33dd..885fc743 100644
+--- lib/fetch/common.c
++++ lib/fetch/common.c
+@@ -609,6 +609,8 @@ happy_eyeballs_connect(struct addrinfo *res0, int verbose)
+ 			if (pfd[i].fd != -1)
+ 				pfd[i].events = POLLOUT;
+ 		}
++		if (!waiting)
++			break;
+ 		if ((ret = poll(pfd, attempts, timeout ? timeout : -1)) == -1) {
+ 			err = errno;
+ 			rv = -1;
+@@ -639,10 +641,6 @@ happy_eyeballs_connect(struct addrinfo *res0, int verbose)
+ 			rv = -1;
+ 			break;
+ 		}
+-		if (!waiting)
+-			break;
+-		else if (done)
+-			goto wait;
+ 	}
+ 
+ out:
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index c1aab76d02f..7cb8886d636 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.55
-revision=4
+revision=5
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"