diff --git a/srcpkgs/xbps/patches/fix-indentation-gcc6.patch b/srcpkgs/xbps/patches/fix-indentation-gcc6.patch
new file mode 100644
index 00000000000..7540fd8a19a
--- /dev/null
+++ b/srcpkgs/xbps/patches/fix-indentation-gcc6.patch
@@ -0,0 +1,31 @@
+--- lib/fetch/common.c	2016-09-14 06:03:01.225000000 +0200
++++ lib/fetch/common.c	2016-09-14 06:03:59.355000000 +0200
+@@ -754,17 +754,17 @@
+ 		    NID_commonName, lastpos)) != -1)
+ 		loc = lastpos;
+ 
+-		if (loc > -1) {
+-			nameentry = X509_NAME_get_entry(subject, loc);
+-			namedata = X509_NAME_ENTRY_get_data(nameentry);
+-			cnlen = ASN1_STRING_to_UTF8(&cn, namedata);
+-			if (ip == NULL &&
+-			    fetch_ssl_hname_match(host, strlen(host), (const char *)cn, cnlen))
+-				ret = 1;
+-			else if (ip != NULL && fetch_ssl_ipaddr_match(ip, (const char *)cn, cnlen))
+-				ret = 1;
+-			OPENSSL_free(cn);
+-		}
++	if (loc > -1) {
++		nameentry = X509_NAME_get_entry(subject, loc);
++		namedata = X509_NAME_ENTRY_get_data(nameentry);
++		cnlen = ASN1_STRING_to_UTF8(&cn, namedata);
++		if (ip == NULL &&
++		    fetch_ssl_hname_match(host, strlen(host), (const char *)cn, cnlen))
++			ret = 1;
++		else if (ip != NULL && fetch_ssl_ipaddr_match(ip, (const char *)cn, cnlen))
++			ret = 1;
++		OPENSSL_free(cn);
++	}
+ 	return (ret);
+ }
+ 
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index ef20fa44942..4ac747fbf02 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.51
-revision=9
+revision=10
 bootstrap=yes
 build_style=configure
 short_desc="The XBPS package system utilities"