diff --git a/proxmark3-flasher-git/.SRCINFO b/proxmark3-flasher-git/.SRCINFO
new file mode 100644
index 00000000..8ba88f2b
--- /dev/null
+++ b/proxmark3-flasher-git/.SRCINFO
@@ -0,0 +1,21 @@
+pkgbase = proxmark3-flasher-git
+	pkgdesc = Offical proxmark3 flasher
+	pkgver = r2391.d6e1d482
+	pkgrel = 1
+	url = https://github.com/Proxmark/proxmark3/
+	arch = i686
+	arch = x86_64
+	license = GPL3
+	makedepends = git
+	makedepends = arm-none-eabi-gcc
+	makedepends = arm-none-eabi-newlib
+	makedepends = devkitarm
+	depends = termcap
+	depends = pcsclite
+	provides = proxmark3-flasher
+	conflicts = proxmark3-flasher
+	source = git+https://github.com/Proxmark/proxmark3.git
+	sha256sums = SKIP
+
+pkgname = proxmark3-flasher-git
+
diff --git a/proxmark3-flasher-git/PKGBUILD b/proxmark3-flasher-git/PKGBUILD
new file mode 100644
index 00000000..add0cca5
--- /dev/null
+++ b/proxmark3-flasher-git/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: mutantmonkey <aur@mutantmonkey.mx>
+# Contributor: James Swineson <aur@public.swineson.me>
+
+pkgname=proxmark3-flasher-git
+pkgver=r2391.d6e1d482
+pkgrel=1
+pkgdesc="Offical proxmark3 flasher"
+url="https://github.com/Proxmark/proxmark3/"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('termcap' 'pcsclite')
+makedepends=('git' 'arm-none-eabi-gcc' 'arm-none-eabi-newlib' 'devkitarm')
+provides=('proxmark3-flasher')
+conflicts=('proxmark3-flasher')
+source=('git+https://github.com/Proxmark/proxmark3.git')
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "$srcdir/proxmark3"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+build() {
+  cd "$srcdir/proxmark3"
+  make
+}
+
+package() {
+  cd "$srcdir/proxmark3"
+  install -Dm755 client/flasher "$pkgdir/usr/bin/proxmark3-flasher"
+  install -d "$pkgdir/usr/share/proxmark3-flasher/bootrom"
+  install -m644 bootrom/obj/*.elf "$pkgdir/usr/share/proxmark3-flasher/bootrom"
+  install -d "$pkgdir/usr/share/proxmark3-flasher/armsrc"
+  install -m644 armsrc/obj/*.elf "$pkgdir/usr/share/proxmark3-flasher/armsrc"
+}