diff --git a/srcpkgs/xbps-src-git/INSTALL b/srcpkgs/xbps-src-git/INSTALL
new file mode 100644
index 00000000000..b5a8843276b
--- /dev/null
+++ b/srcpkgs/xbps-src-git/INSTALL
@@ -0,0 +1,8 @@
+case ${ACTION} in
+post)
+	# Sets up required capabilities on helpers.
+	setcap cap_sys_admin=ep usr/libexec/xbps-src/capmount
+	setcap cap_sys_admin=ep usr/libexec/xbps-src/capumount
+	setcap cap_sys_chroot=ep usr/libexec/xbps-src/capchroot
+	;;
+esac
diff --git a/srcpkgs/xbps-src-git/template b/srcpkgs/xbps-src-git/template
new file mode 100644
index 00000000000..9413c3568d8
--- /dev/null
+++ b/srcpkgs/xbps-src-git/template
@@ -0,0 +1,42 @@
+# Template file for 'xbps-src-git'
+pkgname=xbps-src-git
+version="$(date -u +%Y%m%d)"
+build_style=gnu-makefile
+make_build_args="PREFIX=/usr ETCDIR=/etc/xbps"
+make_install_args="PREFIX=/usr ETCDIR=/etc/xbps"
+short_desc="The XBPS package system - binary package builder (git snaphost)"
+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."
+
+provides="xbps-src-9999"
+replaces="xbps-src>=0"
+conf_files="/etc/xbps/xbps-src.conf"
+nofetch=yes
+noextract=yes
+
+Add_dependency full gcc-c++
+Add_dependency full make
+Add_dependency full bison
+Add_dependency full gettext
+Add_dependency full texinfo
+Add_dependency full patch
+Add_dependency full perl ">=0"
+Add_dependency full fakeroot
+Add_dependency full libcap-progs
+Add_dependency run xbps-static
+Add_dependency full git
+Add_dependency build libcap-devel
+
+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-git/xbps-src-git.flist b/srcpkgs/xbps-src-git/xbps-src-git.flist
new file mode 100644
index 00000000000..c0358e87a37
--- /dev/null
+++ b/srcpkgs/xbps-src-git/xbps-src-git.flist
@@ -0,0 +1,39 @@
+/usr/sbin/xbps-src
+/usr/libexec/xbps-src/chroot-helper.sh
+/usr/libexec/xbps-src/doinst-helper.sh
+/usr/libexec/xbps-src/capmount
+/usr/libexec/xbps-src/capumount
+/usr/libexec/xbps-src/capchroot
+/usr/share/xbps-src/helpers/cmake.sh
+/usr/share/xbps-src/helpers/configure.sh
+/usr/share/xbps-src/helpers/gnu-configure.sh
+/usr/share/xbps-src/helpers/gnu-makefile.sh
+/usr/share/xbps-src/helpers/perl-module.sh
+/usr/share/xbps-src/helpers/python-module.sh
+/usr/share/xbps-src/helpers/replace-interpreter.sh
+/usr/share/xbps-src/helpers/waf.sh
+/usr/share/xbps-src/shutils/build_funcs.sh
+/usr/share/xbps-src/shutils/builddep_funcs.sh
+/usr/share/xbps-src/shutils/check_installed_packages.sh
+/usr/share/xbps-src/shutils/chroot.sh
+/usr/share/xbps-src/shutils/common_funcs.sh
+/usr/share/xbps-src/shutils/configure_funcs.sh
+/usr/share/xbps-src/shutils/extract_funcs.sh
+/usr/share/xbps-src/shutils/fetch_funcs.sh
+/usr/share/xbps-src/shutils/init_funcs.sh
+/usr/share/xbps-src/shutils/install_files.sh
+/usr/share/xbps-src/shutils/make-binpkg.sh
+/usr/share/xbps-src/shutils/metadata.sh
+/usr/share/xbps-src/shutils/metadata_scripts.sh
+/usr/share/xbps-src/shutils/patch_funcs.sh
+/usr/share/xbps-src/shutils/pkgtarget_funcs.sh
+/usr/share/xbps-src/shutils/show.sh
+/usr/share/xbps-src/shutils/show_revdeps.sh
+/usr/share/xbps-src/shutils/stow_funcs.sh
+/usr/share/xbps-src/shutils/strip_files.sh
+/usr/share/xbps-src/shutils/tmpl_funcs.sh
+/usr/share/xbps-src/shutils/verify_flist.sh
+/usr/share/xbps-src/shutils/verify_rundeps.sh
+/usr/share/xbps-src/chroot/xbps.conf
+/etc/xbps/xbps-src.conf
+/etc/xbps/virtualpkg.d/xbps-src-git.conf
diff --git a/srcpkgs/xbps-src-git/xbps-src-git.rshlibs b/srcpkgs/xbps-src-git/xbps-src-git.rshlibs
new file mode 100644
index 00000000000..c8d6a9742d6
--- /dev/null
+++ b/srcpkgs/xbps-src-git/xbps-src-git.rshlibs
@@ -0,0 +1,2 @@
+libcap.so.2
+libc.so.6