diff --git a/src/emulationstation-git/.SRCINFO b/src/emulationstation-git/.SRCINFO
new file mode 100644
index 0000000..6b6c3e6
--- /dev/null
+++ b/src/emulationstation-git/.SRCINFO
@@ -0,0 +1,32 @@
+# Generated by mksrcinfo v8
+# Mon Jun 13 03:14:17 UTC 2016
+pkgbase = emulationstation-git
+	pkgdesc = A graphical front-end for emulators with controller navigation. Developed for the Raspbery Pi, but runs on most Linux systems.
+	pkgver = 819.76c1538
+	pkgrel = 1
+	url = https://github.com/Herdinger/EmulationStation
+	arch = i686
+	arch = x86_64
+	arch = armv6h
+	arch = armv7h
+	license = MIT
+	makedepends = git
+	makedepends = boost
+	makedepends = freetype2
+	makedepends = eigen
+	makedepends = cmake
+	makedepends = mesa
+	makedepends = libsm
+	depends = alsa-lib
+	depends = sdl2
+	depends = boost-libs
+	depends = freeimage
+	depends = ttf-dejavu
+	depends = glu
+	depends = libgl
+	provides = emulationstation
+	source = git://github.com/Herdinger/EmulationStation.git
+	md5sums = SKIP
+
+pkgname = emulationstation-git
+
diff --git a/src/emulationstation-git/PKGBUILD b/src/emulationstation-git/PKGBUILD
new file mode 100644
index 0000000..43d8b5d
--- /dev/null
+++ b/src/emulationstation-git/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer : Johnathan Jenkins <twodopeshaggy@gmail.com>
+# Contributor: Drew Liszewski <drew dot liszewski at gmail dot com>
+# Contributor: Daniel Varga <varga dot daniel at gmx dot de>
+
+pkgname=emulationstation-git
+_gitname=EmulationStation
+pkgrel=1
+pkgver=820.54a3c3e
+pkgdesc="A graphical front-end for emulators with controller navigation. Developed for the Raspbery Pi, but runs on most Linux systems."
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+url="https://github.com/Herdinger/EmulationStation"
+license=('MIT')
+makedepends=('git' 'boost' 'freetype2' 'eigen' 'cmake' 'mesa' 'libsm')
+depends=('alsa-lib' 'sdl2' 'boost-libs' 'freeimage' 'ttf-dejavu' 'glu')
+if [ "$CARCH" = "armv6h" ]; then
+depends+=('raspberrypi-firmware')
+else
+depends+=('libgl')
+fi
+source=('git://github.com/Herdinger/EmulationStation.git')
+md5sums=('SKIP')
+provides=('emulationstation')
+
+pkgver() {
+  cd $srcdir/$_gitname
+  printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"  
+}
+
+build() {
+    mkdir "$srcdir/$_gitname/build"
+    cd "$srcdir/$_gitname/build"
+    cmake ..
+    make
+}
+
+package() {
+    cd $_gitname
+    install -Dm755 "$srcdir/$_gitname/emulationstation" "$pkgdir/usr/bin/emulationstation"
+    install -Dm644 "$srcdir/$_gitname/LICENSE.md" "$pkgdir/usr/share/licenses/emulationstation-git/LICENSE"
+    rm -r "$srcdir"
+}
+