diff --git a/srcpkgs/xbps-src-git/template b/srcpkgs/xbps-src-git/template
deleted file mode 100644
index 6dae795fd97..00000000000
--- a/srcpkgs/xbps-src-git/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'xbps-src-git'
-pkgname=xbps-src-git
-version="$(date -u +%Y%m%d)"
-revision=5
-build_style=gnu-makefile
-make_build_args="PREFIX=/usr ETCDIR=/etc/xbps"
-make_install_args="PREFIX=/usr ETCDIR=/etc/xbps"
-provides="xbps-src-${version}"
-replaces="xbps-src>=0"
-conf_files="/etc/xbps/xbps-src.conf"
-short_desc="The XBPS package system - binary package builder"
-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 package includes xbps-src, the
- utility to build XBPS binary packages from source packages.
-
- This package includes code from master branch of development git
- repository. Do not use it if you aren't a developer."
-
-noarch=yes
-nofetch=yes
-noextract=yes
-
-makedepends="git"
-depends="xbps-triggers>=0.54"
-
-do_fetch() {
-	local url="git://github.com/xtraeme/xbps-src"
-	msg_normal "Fetching source from $url ...\n"
-	git clone ${url} ${pkgname}-${version}
-}
diff --git a/srcpkgs/xbps-src/template b/srcpkgs/xbps-src/template
index 8e1318b05c6..4c19d5fa191 100644
--- a/srcpkgs/xbps-src/template
+++ b/srcpkgs/xbps-src/template
@@ -1,20 +1,30 @@
 # Template file for 'xbps-src'
 pkgname=xbps-src
-version=31
+version="$(date -u +%Y%m%d)"
 revision=1
-noarch=yes
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr ETCDIR=/etc/xbps"
 make_install_args="PREFIX=/usr ETCDIR=/etc/xbps"
-depends="gcc-c++ make bison gettext texinfo patch perl fakeroot xbps"
-fulldepends="git"
-replaces="xbps-src>=0"
 conf_files="/etc/xbps/xbps-src.conf"
 short_desc="The XBPS package system - binary package builder"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
 license="Simplified BSD"
-distfiles="https://github.com/downloads/xtraeme/xbps-src/xbps-src-${version}.tar.gz"
-checksum=c025e81b26d92900f3b63f1339fe2819ac81a9cec6dba37862577c057f79ac49
 long_desc="
- xbps-src is the xbps binary package builder."
+ The XBPS package system. A new, fast, from scratch and simple
+ binary package manager. This package includes xbps-src, the
+ utility to build XBPS binary packages from source packages."
+
+noarch=yes
+nofetch=yes
+noextract=yes
+
+makedepends="git"
+depends="xbps-triggers>=0.54"
+replaces="xbps-src-git>=0"
+
+do_fetch() {
+	local url="git://github.com/xtraeme/xbps-src"
+	msg_normal "Fetching source from $url ...\n"
+	git clone ${url} ${pkgname}-${version}
+}