diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index dac0237382..cb1f44486c 100644
--- a/srcpkgs/xbps-static/template
+++ b/srcpkgs/xbps-static/template
@@ -3,7 +3,7 @@
 # NOTE: keep this package synchronized with "srcpkgs/xbps".
 pkgname=xbps-static
 version=0.49
-revision=2
+revision=3
 build_style=configure
 short_desc="The XBPS package system utilities - static binaries"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
diff --git a/srcpkgs/xbps/patches/0001-alternatives-really-make-relative-symlinks-this-time.patch b/srcpkgs/xbps/patches/0001-alternatives-really-make-relative-symlinks-this-time.patch
index cecbc1d102..ec863278ec 100644
--- a/srcpkgs/xbps/patches/0001-alternatives-really-make-relative-symlinks-this-time.patch
+++ b/srcpkgs/xbps/patches/0001-alternatives-really-make-relative-symlinks-this-time.patch
@@ -19,7 +19,7 @@ index 958c9f1..b71081e 100644
  		xbps_string_t str;
 -		char *l, *lnk;
 -		const char *tgt;
-+		char *l, *lnk, *tgt = NULL;
++		char *l, *lnk, *tgt;
 +		const char *tgt0;
  		int rv;
  
diff --git a/srcpkgs/xbps/patches/0002-alternatives-fix-a-warning.patch b/srcpkgs/xbps/patches/0002-alternatives-fix-a-warning.patch
new file mode 100644
index 0000000000..14e726a83b
--- /dev/null
+++ b/srcpkgs/xbps/patches/0002-alternatives-fix-a-warning.patch
@@ -0,0 +1,25 @@
+From 33a1bea633048a9d52f1ba52ec19852d321ffb37 Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@voidlinux.eu>
+Date: Sat, 31 Oct 2015 14:07:12 +0100
+Subject: [PATCH 1/2] alternatives: fix a warning.
+
+---
+ lib/package_alternatives.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/package_alternatives.c b/lib/package_alternatives.c
+index b71081e..58caa41 100644
+--- lib/package_alternatives.c
++++ lib/package_alternatives.c
+@@ -102,7 +102,7 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
+ 	cnt = xbps_array_count(a);
+ 	for (i = 0; i < cnt; i++) {
+ 		xbps_string_t str;
+-		char *l, *lnk, *tgt;
++		char *l, *lnk, *tgt = NULL;
+ 		const char *tgt0;
+ 		int rv;
+ 
+-- 
+2.6.2
+
diff --git a/srcpkgs/xbps/patches/0003-alternatives-fix-an-assertion.patch b/srcpkgs/xbps/patches/0003-alternatives-fix-an-assertion.patch
new file mode 100644
index 0000000000..4a9666d646
--- /dev/null
+++ b/srcpkgs/xbps/patches/0003-alternatives-fix-an-assertion.patch
@@ -0,0 +1,25 @@
+From f896b17ba73a51451b221ebfc1bae59022cabcec Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@voidlinux.eu>
+Date: Sat, 31 Oct 2015 14:19:50 +0100
+Subject: [PATCH 2/2] alternatives: fix an assertion!
+
+---
+ lib/package_alternatives.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/package_alternatives.c b/lib/package_alternatives.c
+index 58caa41..19c1422 100644
+--- lib/package_alternatives.c
++++ lib/package_alternatives.c
+@@ -110,7 +110,7 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
+ 		l = left(xbps_string_cstring_nocopy(str));
+ 		assert(l);
+ 		tgt0 = right(xbps_string_cstring_nocopy(str));
+-		assert(tgt);
++		assert(tgt0);
+ 		if (l[0] != '/') {
+ 			char *tgt_dup, *tgt_dir;
+ 			tgt_dup = strdup(tgt0);
+-- 
+2.6.2
+
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b1255037dd..52fb5b6374 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.49
-revision=2
+revision=3
 bootstrap=yes
 build_style=configure
 short_desc="The XBPS package system utilities"