diff --git a/srcpkgs/xbps-git/libxbps-devel-git.template b/srcpkgs/xbps-git/libxbps-devel-git.template
index 4e37a2571c..9c0b54f597 100644
--- a/srcpkgs/xbps-git/libxbps-devel-git.template
+++ b/srcpkgs/xbps-git/libxbps-devel-git.template
@@ -1,11 +1,8 @@
 # Template file for 'libxbps'.
 #
 short_desc="${short_desc} - runtime library (development files)"
-long_desc="${long_desc}
-
- This package contains the libxbps develoment files."
-
-depends="zlib-devel proplib-devel confuse-devel libfetch-devel libarchive-devel libxbps>=$version"
+depends="zlib-devel proplib-devel confuse-devel libfetch-devel
+ libarchive-devel libxbps>=${version}"
 provides="libxbps-devel-${version}"
 replaces="libxbps-devel>=0"
 
diff --git a/srcpkgs/xbps-git/libxbps-git.template b/srcpkgs/xbps-git/libxbps-git.template
index 9c02d08fa3..cb2c4f1d42 100644
--- a/srcpkgs/xbps-git/libxbps-git.template
+++ b/srcpkgs/xbps-git/libxbps-git.template
@@ -1,10 +1,6 @@
 # Template file for 'libxbps'.
 #
 short_desc="${short_desc} - runtime library"
-long_desc="${long_desc}
-
- This package contains libxbps, the XBPS runtime shared library."
-
 provides="libxbps-${version}"
 replaces="libxbps>=0 xbps-devel>=0"
 
diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template
index 351b868821..35ae5aac58 100644
--- a/srcpkgs/xbps-git/template
+++ b/srcpkgs/xbps-git/template
@@ -1,14 +1,14 @@
 # Template file for 'xbps-git'
 pkgname=xbps-git
 version="$(date -u +%Y%m%d)"
-revision=1
+revision=2
 nofetch=yes
 noextract=yes
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
  --with-static --with-tests"
 depends="xbps-triggers libxbps>=${version}"
-makedepends="git which pkg-config zlib-devel proplib-devel openssl-devel
+makedepends="git which pkg-config proplib-devel openssl-devel
  libarchive-devel libfetch-devel confuse-devel atf-devel>=0.16"
 conf_files="/etc/xbps/xbps.conf"
 subpackages="libxbps-git libxbps-devel-git xbps-tests-git xbps-static-git"
@@ -18,10 +18,6 @@ short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
 license="Simplified BSD"
-long_desc="
- The XBPS package system. A new, fast, from scratch and simple
- binary package manager. This packages includes code from a development
- branch available from https://github.com/xtraeme/xbps"
 
 do_fetch() {
 	local url="git://github.com/xtraeme/xbps"
diff --git a/srcpkgs/xbps-git/xbps-static-git.template b/srcpkgs/xbps-git/xbps-static-git.template
index fc01425511..d813c33610 100644
--- a/srcpkgs/xbps-git/xbps-static-git.template
+++ b/srcpkgs/xbps-git/xbps-static-git.template
@@ -4,10 +4,6 @@ provides="xbps-static-${version}"
 replaces="xbps-static>=0 xbps-devel-static>=0"
 depends="xbps-triggers"
 short_desc="${sourcepkg} static binaries"
-long_desc="${long_desc}
-
- This package contains the static binaries and library, that can be
- used on any GNU/Linux distribution matching the architecture."
 
 do_install() {
 	vmove "usr/sbin/*.static" usr/sbin
diff --git a/srcpkgs/xbps-git/xbps-tests-git.template b/srcpkgs/xbps-git/xbps-tests-git.template
index bbf198a6d3..72e84c942b 100644
--- a/srcpkgs/xbps-git/xbps-tests-git.template
+++ b/srcpkgs/xbps-git/xbps-tests-git.template
@@ -1,11 +1,7 @@
 # Template file for 'xbps-tests'.
 #
 short_desc="${short_desc} - Kyua testsuite"
-long_desc="${long_desc}
-
- This package contains the Kyua testsuite."
-
-depends="libxbps>=$version"
+depends="libxbps>=${version}"
 provides="xbps-tests-${version}"
 replaces="xbps-tests>=0"