diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template
index fd64d7e120..48caecd760 100644
--- a/srcpkgs/xbps-git/template
+++ b/srcpkgs/xbps-git/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-git'
 pkgname=xbps-git
-version=20140319
+version=20140320
 revision=1
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -23,7 +23,7 @@ do_fetch() {
 }
 
 do_configure() {
-	HAVE_VASPRINTF=1 ./configure --prefix=/usr --sysconfdir=/etc --enable-debug --enable-static --enable-tests
+	HAVE_VASPRINTF=1 ./configure --prefix=/usr --sysconfdir=/etc --enable-debug --enable-tests
 }
 
 do_build() {
@@ -56,16 +56,6 @@ libxbps-devel-git_package() {
 	}
 }
 
-xbps-static-git_package() {
-	provides="xbps-static-${version}_${revision}"
-	replaces="xbps-static>=0 xbps-devel-static>=0"
-	depends="xbps-triggers"
-	short_desc+=" - static binaries"
-	pkg_install() {
-		vmove "usr/sbin/*.static"
-	}
-}
-
 xbps-tests-git_package() {
 	short_desc+=" - Kyua testsuite"
 	depends="libxbps>=${version}"
diff --git a/srcpkgs/xbps-static-git b/srcpkgs/xbps-static-git
deleted file mode 120000
index d14b53352e..0000000000
--- a/srcpkgs/xbps-static-git
+++ /dev/null
@@ -1 +0,0 @@
-xbps-git
\ No newline at end of file
diff --git a/srcpkgs/xbps-static-git/template b/srcpkgs/xbps-static-git/template
new file mode 100644
index 0000000000..51ac53fb96
--- /dev/null
+++ b/srcpkgs/xbps-static-git/template
@@ -0,0 +1,42 @@
+# Template file for 'xbps-static-git'
+#
+# NOTE: keep this package synchronized with "srcpkgs/xbps-git".
+pkgname=xbps-static-git
+version=20140320
+revision=1
+short_desc="The XBPS package system (development branch) - static bins"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.voidlinux.eu/xbps"
+license="Simplified BSD"
+hostmakedepends="which pkg-config"
+makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2"
+
+provides="xbps-static-${version}_${revision}"
+replaces="xbps-static>=0"
+depends="xbps-triggers"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686-musl) CFLAGS+=" -fno-stack-protector";;
+	*-musl) ;;
+	*) msg_error "${pkgname}-${version}: can only be built on musl targets.\n" ;;
+esac
+
+do_fetch() {
+	local url="git://github.com/voidlinux/xbps"
+	msg_normal "Fetching source from $url ...\n"
+	git clone ${url} ${pkgname}-${version}
+}
+
+do_configure() {
+	HAVE_VASPRINTF=1 ./configure --prefix=/usr --sysconfdir=/etc --enable-debug --enable-static
+}
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	make DESTDIR=${wrksrc}/static-install install
+	vmkdir usr/sbin
+	mv ${wrksrc}/static-install/usr/sbin/*.static ${DESTDIR}/usr/sbin
+}