diff --git a/pkgbuild/autojump-git/PKGBUILD b/pkgbuild/autojump-git/PKGBUILD
new file mode 100644
index 0000000..d88870b
--- /dev/null
+++ b/pkgbuild/autojump-git/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Cedric Girard <girard.cedric@gmail.com>
+# Contributor: Jason Axelson <jason.axelsonATgmail.com>
+# Contributor: Sean Escriva <sean.escrivaATgmail.com>
+# Contributor: William Ting <william.h.tingATgmail.com>
+
+pkgname=autojump-git
+pkgver=release.v21.6.9.149.g72313db
+pkgrel=1
+pkgdesc="A faster way to navigate your filesystem from the command line"
+arch=(any)
+url="http://github.com/joelthelion/autojump"
+license=('GPL3')
+depends=('bash' 'python')
+makedepends=('git')
+conflicts=('autojump')
+provides=('autojump')
+replaces=()
+backup=()
+source=('git+https://github.com/joelthelion/autojump.git')
+md5sums=('SKIP')
+install='install'
+
+_gitname="autojump"
+
+pkgver() {
+    cd ${_gitname}
+    git describe --always | sed 's|-|.|g'
+}
+
+prepare() {
+    cd ${_gitname}
+    sed -i 's$#!/usr/bin/env python$#!/usr/bin/env python2$' bin/autojump bin/*.py
+}
+
+package() {
+    cd ${_gitname}
+    /usr/bin/env python2 ./install.py --prefix 'usr/' --destdir "${pkgdir}" --zshshare 'usr/share/zsh/site-functions'
+}
+
+
+# vim:set ts=4 sw=4 et:
diff --git a/pkgbuild/autojump-git/install b/pkgbuild/autojump-git/install
new file mode 100644
index 0000000..fd8ec21
--- /dev/null
+++ b/pkgbuild/autojump-git/install
@@ -0,0 +1,6 @@
+function post_install {
+    echo " > Please add the line to ~/.bashrc :"
+    echo " > [[ -s /etc/profile.d/autojump.bash ]] && . /etc/profile.d/autojump.bash"
+    echo " > Or substitute ~/.zshrc and /etc/profile.d/autojump.zsh"
+    echo " > You need to run 'source ~/.bashrc' before you can start using autojump."
+}