diff --git a/jhbuild-git/PKGBUILD b/jhbuild-git/PKGBUILD
new file mode 100644
index 00000000..e898f465
--- /dev/null
+++ b/jhbuild-git/PKGBUILD
@@ -0,0 +1,46 @@
+# Contributor (MSYS2): David Macek <david.macek.0@gmail.com>
+# Maintainer (AUR): Kerrick Staley <mail@kerrickstaley.com>
+# Contributor (AUR): Thijs Vermeir <thijsvermeir@gmail.com>
+
+_realname=jhbuild
+pkgname="${_realname}-git"
+pkgver=8203.d465faa
+pkgrel=1
+pkgdesc='Downloads and compiles Gnome "modules", i.e. source code packages.'
+url='https://live.gnome.org/Jhbuild/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('python2')
+makedepends=('rsync'
+             'subversion'
+             'gnome-common'
+             'git'
+             'intltool'
+             'gnome-doc-utils'
+             'yelp-tools')
+provides=("${_realname}")
+conflicts=("${_realname}")
+source=('git://git.gnome.org/jhbuild'
+        'module_autogenargs.patch')
+sha256sums=('SKIP'
+            'f92dd2735e47d0032f4069fbf1c4d1207c83eabd0a6317ea78f39d6157e854b2')
+
+pkgver() {
+  cd "${srcdir}/${_realname}"
+  printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+build() {
+    cd "${_realname}"
+    patch -p1 -i "${srcdir}/module_autogenargs.patch"
+    sed 's/env python2$/python2/' -i scripts/jhbuild.in
+    ./autogen.sh --prefix=/usr PYTHON=/usr/bin/python2
+    make
+}
+
+package() {
+    cd "${_realname}"
+    make DESTDIR="${pkgdir}" install
+    install -d "${pkgdir}/usr/share/jhbuild"
+    cp -dr modulesets "${pkgdir}/usr/share/jhbuild"
+}
\ No newline at end of file
diff --git a/jhbuild-git/module_autogenargs.patch b/jhbuild-git/module_autogenargs.patch
new file mode 100644
index 00000000..2341e5dc
--- /dev/null
+++ b/jhbuild-git/module_autogenargs.patch
@@ -0,0 +1,21 @@
+diff --git a/jhbuild/defaults.jhbuildrc b/jhbuild/defaults.jhbuildrc
+index e467a49..de715c4 100644
+--- a/jhbuild/defaults.jhbuildrc
++++ b/jhbuild/defaults.jhbuildrc
+@@ -78,7 +78,15 @@ repos = {}
+ cvsroots = {}
+ svnroots = {}
+ branches = {}
+-module_autogenargs = {}
++# Arch-specific setting: we need to pass PYTHON=/usr/bin/python2 when building some modules.
++module_autogenargs = {
++    'cairo': autogenargs + ' ac_cv_prog_RANLIB=gcc-ranlib RANLIB=gcc-ranlib AR=gcc-ar',
++    'evolution-data-server': autogenargs + ' PYTHON=/usr/bin/python2',
++    'gobject-introspection': autogenargs + ' PYTHON=/usr/bin/python2',
++    'itstool': autogenargs + ' PYTHON=/usr/bin/python2',
++    'telepathy-mission-control': autogenargs + ' PYTHON=/usr/bin/python2',
++    'WebKit': autogenargs + ' PYTHON=/usr/bin/python2',
++}
+ module_cmakeargs = {}
+ module_makeargs = {}
+ module_extra_env = {}