diff --git a/app-vcs/vcstool/autobuild/beyond b/app-vcs/vcstool/autobuild/beyond
new file mode 100644
index 00000000000..878b4cfb662
--- /dev/null
+++ b/app-vcs/vcstool/autobuild/beyond
@@ -0,0 +1,14 @@
+abinfo "Installing shell completion ..."
+mkdir -pv "$PKGDIR"/usr/share/bash-completion/completions
+mkdir -pv "$PKGDIR"/usr/share/zsh/site-functions
+mkdir -pv "$PKGDIR"/usr/share/fish/vendor_completions.d
+mv -v \
+  "$PKGDIR"/usr/share/vcstool-completion/vcs.bash \
+  "$PKGDIR"/usr/share/bash-completion/completions/vcs
+mv -v \
+  "$PKGDIR"/usr/share/vcstool-completion/vcs.zsh \
+  "$PKGDIR"/usr/share/zsh/site-functions/_vcs
+mv -v \
+  "$PKGDIR"/usr/share/vcstool-completion/vcs.fish \
+  "$PKGDIR"/usr/share/fish/vendor_completions.d/vcs.fish
+rm -rv "$PKGDIR"/usr/share/vcstool-completion
diff --git a/app-vcs/vcstool/autobuild/defines b/app-vcs/vcstool/autobuild/defines
new file mode 100644
index 00000000000..efa9f708dbd
--- /dev/null
+++ b/app-vcs/vcstool/autobuild/defines
@@ -0,0 +1,9 @@
+PKGNAME=vcstool
+PKGSEC=vcs
+PKGDEP="setuptools pyyaml"
+PKGSUG="git mercurial subversion"
+PKGDES="Command-line helper for working with multiple source repositories"
+
+NOPYTHON2=1
+ABHOST=noarch
+ABTYPE=python
diff --git a/app-vcs/vcstool/spec b/app-vcs/vcstool/spec
new file mode 100644
index 00000000000..3fba5bde2c5
--- /dev/null
+++ b/app-vcs/vcstool/spec
@@ -0,0 +1,4 @@
+VER=0.3.0
+SRCS="git::commit=tags/$VER::https://github.com/dirk-thomas/vcstool"
+CHKSUMS="SKIP"
+CHKUPDATE="anitya::id=28654"