diff --git a/srcpkgs/xbps/patches/0005-xbps_remove_pkg-ignore-ELOOP-in-realpath-when-checki.patch b/srcpkgs/xbps/patches/0005-xbps_remove_pkg-ignore-ELOOP-in-realpath-when-checki.patch
new file mode 100644
index 00000000000..51e5519a0ab
--- /dev/null
+++ b/srcpkgs/xbps/patches/0005-xbps_remove_pkg-ignore-ELOOP-in-realpath-when-checki.patch
@@ -0,0 +1,27 @@
+From a8e8e8fd5d59663a0472676ce40b66c4143b9f34 Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@gmail.com>
+Date: Mon, 4 Feb 2013 16:35:15 +0100
+Subject: [PATCH] xbps_remove_pkg: ignore ELOOP in realpath() when checking
+ symlinks.
+
+Probably it is a broken symlink, so we don't have to care about it.
+---
+ lib/package_remove.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/package_remove.c b/lib/package_remove.c
+index 4e69e82..78ddd7b 100644
+--- lib/package_remove.c
++++ lib/package_remove.c
+@@ -170,7 +170,7 @@ xbps_remove_pkg_files(struct xbps_handle *xhp,
+ 			 * point, so we will only remove dangling symlinks.
+ 			 */
+ 			if (realpath(path, buf) == NULL) {
+-				if (errno != ENOENT) {
++				if (errno != ENOENT && errno != ELOOP) {
+ 					free(path);
+ 					rv = errno;
+ 					break;
+-- 
+1.8.1.1
+
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 816bba194e3..b8311c05e61 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.20
-revision=6
+revision=7
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
  --enable-tests --enable-static --enable-debug"