diff --git a/git-extras/.SRCINFO b/git-extras/.SRCINFO
new file mode 100644
index 0000000..36e0f0a
--- /dev/null
+++ b/git-extras/.SRCINFO
@@ -0,0 +1,13 @@
+pkgbase = git-extras
+	pkgdesc = GIT utilities -- repo summary, commit counting, repl, changelog population and more
+	pkgver = 6.1.0
+	pkgrel = 1
+	url = https://github.com/tj/git-extras
+	arch = any
+	license = MIT
+	depends = git
+	source = git-extras-6.1.0.tar.gz::https://github.com/tj/git-extras/archive/6.1.0.tar.gz
+	sha256sums = 7be0b15ee803d76d2c2e8036f5d9db6677f2232bb8d2c4976691ff7ae026a22f
+	b2sums = 3450edecb3116e19ffcf918b118aee04f025c06d812e29e8701f35a3c466b13d2578d41c8e1ee93327743d0019bf98bb3f397189e19435f89e3a259ff1b82747
+
+pkgname = git-extras
diff --git a/git-extras/.gitrepo b/git-extras/.gitrepo
new file mode 100644
index 0000000..f72fbc5
--- /dev/null
+++ b/git-extras/.gitrepo
@@ -0,0 +1,12 @@
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git "subrepo", and this file is maintained by the
+; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+;
+[subrepo]
+	remote = https://aur.archlinux.org/git-extras
+	branch = master
+	commit = 2d30cf859a878fd00196b820c86bfecbebd6a8e0
+	parent = af84871c7bd0be0fd7c9c6e5aced15a2ad24038c
+	method = merge
+	cmdver = 0.4.3
diff --git a/git-extras/PKGBUILD b/git-extras/PKGBUILD
new file mode 100644
index 0000000..bf50dd0
--- /dev/null
+++ b/git-extras/PKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
+# Contributor: Stefan Tatschner <stefan.tatschner@gmail.com>
+
+# All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
+
+pkgname=git-extras
+pkgver=6.1.0
+pkgrel=1
+pkgdesc="GIT utilities -- repo summary, commit counting, repl, changelog population and more"
+arch=('any')
+url="https://github.com/tj/${pkgname}"
+license=('MIT')
+depends=('git')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
+sha256sums=('7be0b15ee803d76d2c2e8036f5d9db6677f2232bb8d2c4976691ff7ae026a22f')
+b2sums=('3450edecb3116e19ffcf918b118aee04f025c06d812e29e8701f35a3c466b13d2578d41c8e1ee93327743d0019bf98bb3f397189e19435f89e3a259ff1b82747')
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+
+    # avoid annoying interactive prompts if an alias is in your gitconfig
+    export GIT_CONFIG=/dev/null
+    make DESTDIR="${pkgdir}" PREFIX=/usr SYSCONFDIR=/etc install
+    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}