diff --git a/src/libretro-atari800-git/.SRCINFO b/src/libretro-atari800-git/.SRCINFO
new file mode 100644
index 0000000..015e76d
--- /dev/null
+++ b/src/libretro-atari800-git/.SRCINFO
@@ -0,0 +1,27 @@
+# Generated by mksrcinfo v8
+# Fri Sep 16 02:29:05 UTC 2016
+pkgbase = libretro-atari800-git
+	pkgdesc = libretro implementation of Atari800 v3.1.0 (Atari 5200/400/800/XL/XE) (WIP)
+	pkgver = 15.6e1883b
+	pkgrel = 2
+	url = https://github.com/r-type/libretro-atari800.git
+	arch = i686
+	arch = x86_64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	groups = libretro
+	license = GPL2
+	makedepends = git
+	depends = zlib
+	source = git+https://github.com/r-type/libretro-atari800.git
+	source = atari800_libretro.info
+	source = cfg.patch
+	source = joycfg.patch
+	sha256sums = SKIP
+	sha256sums = f482663fa58468d889e615909ba9e09d2e616300a9575338b86ce1b93d751bdb
+	sha256sums = 41e0c608d07cdc3228d37a7a29fd40b6629e964c13d14ba413fa84e956ef3777
+	sha256sums = d30794556b622c757dbafb5ce988547967004bd2d779c74e28802f9dd78a167f
+
+pkgname = libretro-atari800-git
+
diff --git a/src/libretro-atari800-git/PKGBUILD b/src/libretro-atari800-git/PKGBUILD
new file mode 100644
index 0000000..bcfcce0
--- /dev/null
+++ b/src/libretro-atari800-git/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
+
+pkgname=libretro-atari800-git
+pkgver=15.6e1883b
+pkgrel=2
+pkgdesc="libretro implementation of Atari800 v3.1.0 (Atari 5200/400/800/XL/XE) (WIP)"
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
+url="https://github.com/r-type/libretro-atari800.git"
+license=('GPL2')
+groups=('libretro')
+depends=('zlib')
+makedepends=('git')
+
+_libname=atari800_libretro
+_gitname=libretro-atari800
+source=("git+https://github.com/r-type/${_gitname}.git"
+	"${_libname}.info"
+	"cfg.patch"
+	"joycfg.patch")
+sha256sums=('SKIP'
+	'f482663fa58468d889e615909ba9e09d2e616300a9575338b86ce1b93d751bdb'
+	'41e0c608d07cdc3228d37a7a29fd40b6629e964c13d14ba413fa84e956ef3777'
+	'd30794556b622c757dbafb5ce988547967004bd2d779c74e28802f9dd78a167f')
+
+pkgver() {
+  cd "${_gitname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+build() {
+  cd ${_gitname}
+  # rename config file to not interfere with original atari800
+  patch -p0 < "../cfg.patch"
+  patch -p0 < "../joycfg.patch"
+  make -f Makefile
+}
+
+package() {
+  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
+  install -Dm644 "${_libname}.info" "${pkgdir}/usr/lib/libretro/${_libname}.info"
+}
diff --git a/src/libretro-atari800-git/atari800_libretro.info b/src/libretro-atari800-git/atari800_libretro.info
new file mode 100644
index 0000000..15fc5d7
--- /dev/null
+++ b/src/libretro-atari800-git/atari800_libretro.info
@@ -0,0 +1,18 @@
+display_name = "Atari 5200/400/800/XL/XE (Atari800)"
+authors = "Petr Stehlik"
+supported_extensions = "xfd|atr|cdm|cas|bin|a52|zip"
+corename = "Atari800"
+manufacturer = "Atari"
+categories = "Emulator"
+systemname = "Atari 5200/400/800/XL/XE"
+license = "GPLv2"
+permissions = ""
+display_version = "3.1.0"
+supports_no_game = "false"
+firmware_count = 2
+firmware0_desc = "ATARIOSB.ROM (Atari OS-B image file)"
+firmware0_path = "ATARIOSB.ROM"
+firmware0_opt = "false"
+firmware1_desc = "ATARIXL.ROM (Atari-XL image file)"
+firmware1_path = "ATARIXL.ROM"
+firmware1_opt = "false"
diff --git a/src/libretro-atari800-git/cfg.patch b/src/libretro-atari800-git/cfg.patch
new file mode 100644
index 0000000..89779f2
--- /dev/null
+++ b/src/libretro-atari800-git/cfg.patch
@@ -0,0 +1,17 @@
+diff -uNr atari800.orig/src/cfg.c atari800/src/cfg.c
+--- atari800.orig/src/cfg.c	2016-02-23 14:28:55.247008447 +0100
++++ atari800/src/cfg.c	2016-02-23 14:29:07.360269454 +0100
+@@ -68,11 +68,11 @@
+ /* If another default path config path is defined use it
+    otherwise use the default one */
+ #ifndef DEFAULT_CFG_NAME
+-#define DEFAULT_CFG_NAME ".atari800.cfg"
++#define DEFAULT_CFG_NAME ".atari800.cfg.libretro"
+ #endif
+ 
+ #ifndef SYSTEM_WIDE_CFG_FILE
+-#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg"
++#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg.libretro"
+ #endif
+ 
+ static char rtconfig_filename[FILENAME_MAX];
diff --git a/src/libretro-atari800-git/joycfg.patch b/src/libretro-atari800-git/joycfg.patch
new file mode 100644
index 0000000..81368c2
--- /dev/null
+++ b/src/libretro-atari800-git/joycfg.patch
@@ -0,0 +1,37 @@
+diff -uNr atari800.orig/src/joycfg.c atari800/src/joycfg.c
+--- atari800.orig/src/joycfg.c	2016-02-23 14:17:28.000000000 +0100
++++ atari800/src/joycfg.c	2016-02-23 14:24:09.282074155 +0100
+@@ -434,7 +434,7 @@
+   int i,no;
+   int bad=0;
+ 
+-  if ((fr=fopen("atari800.cfg","r"))==NULL)
++  if ((fr=fopen("atari800.cfg.libretro","r"))==NULL)
+   {
+     printf("Error opening configuration file.\n"
+            "Execute this utility from atari800 dir after configuring it!\n");
+@@ -494,9 +494,9 @@
+   char string[256];
+   int i;
+ 
+-  if ((fr=fopen("atari800.cfg","r"))==NULL)
++  if ((fr=fopen("atari800.cfg.libretro","r"))==NULL)
+   {
+-    printf("Error opening atari800.cfg!\n");
++    printf("Error opening atari800.cfg.libretro!\n");
+     return;
+   }
+   if ((fw=fopen("atari800.tmp","w"))==NULL)
+@@ -521,10 +521,10 @@
+   for (i=0;i<4;i++)
+     fprintf(fw,"JOYSTICK_%i=%s\n",i,joyparams[joytypes[i]]);
+   fclose(fw);
+-  if (rename("atari800.tmp","atari800.cfg")==0)
++  if (rename("atari800.tmp","atari800.cfg.libretro")==0)
+     printf("Configuration successfully saved.\n");
+   else
+-    printf("Error when renaming atari800.tmp to atari800.cfg!\n");
++    printf("Error when renaming atari800.tmp to atari800.cfg.libretro!\n");
+ }
+ /*------------------------------------------------------------------------*/
+ int main()
diff --git a/src/libretro-handy-git/.SRCINFO b/src/libretro-handy-git/.SRCINFO
new file mode 100644
index 0000000..d8552f4
--- /dev/null
+++ b/src/libretro-handy-git/.SRCINFO
@@ -0,0 +1,23 @@
+# Generated by mksrcinfo v8
+# Fri Sep 16 02:37:28 UTC 2016
+pkgbase = libretro-handy-git
+	pkgdesc = libretro implementation of Handy. (Atari Lynx)
+	pkgver = 86.6c67bdc
+	pkgrel = 1
+	url = https://github.com/libretro/libretro-handy
+	arch = i686
+	arch = x86_64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	groups = libretro
+	license = GPL3
+	makedepends = git
+	depends = zlib
+	source = git+https://github.com/libretro/libretro-handy.git
+	source = https://raw.github.com/libretro/libretro-super/master/dist/info/handy_libretro.info
+	sha256sums = SKIP
+	sha256sums = SKIP
+
+pkgname = libretro-handy-git
+
diff --git a/src/libretro-handy-git/PKGBUILD b/src/libretro-handy-git/PKGBUILD
new file mode 100644
index 0000000..dc4cd68
--- /dev/null
+++ b/src/libretro-handy-git/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
+
+pkgname=libretro-handy-git
+pkgver=91.6bdbde2
+pkgrel=1
+pkgdesc="libretro implementation of Handy. (Atari Lynx)"
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
+url="https://github.com/libretro/libretro-handy"
+license=('GPL3')
+groups=('libretro')
+depends=('zlib')
+makedepends=('git')
+
+_libname=handy_libretro
+_gitname=libretro-handy
+source=("git+https://github.com/libretro/${_gitname}.git"
+	"https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
+sha256sums=('SKIP'
+	'SKIP')
+
+pkgver() {
+  cd "${_gitname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+build() {
+  cd "${_gitname}"
+  make
+}
+
+package() {
+  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
+  install -Dm644 "${_libname}.info" "${pkgdir}/usr/lib/libretro/${_libname}.info"
+}
diff --git a/src/libretro-hatari-git/.SRCINFO b/src/libretro-hatari-git/.SRCINFO
new file mode 100644
index 0000000..8c1c5e4
--- /dev/null
+++ b/src/libretro-hatari-git/.SRCINFO
@@ -0,0 +1,23 @@
+# Generated by mksrcinfo v8
+# Fri Sep 16 02:52:47 UTC 2016
+pkgbase = libretro-hatari-git
+	pkgdesc = libretro implementation of Hatari v1.8 (Atari ST/STE/TT/Falcon)
+	pkgver = 5423.4930236
+	pkgrel = 1
+	url = https://github.com/libretro/hatari
+	arch = i686
+	arch = x86_64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	groups = libretro
+	license = GPL2
+	makedepends = git
+	depends = zlib
+	source = git+https://github.com/libretro/hatari.git
+	source = https://raw.github.com/libretro/libretro-super/master/dist/info/hatari_libretro.info
+	sha256sums = SKIP
+	sha256sums = SKIP
+
+pkgname = libretro-hatari-git
+
diff --git a/src/libretro-hatari-git/PKGBUILD b/src/libretro-hatari-git/PKGBUILD
new file mode 100644
index 0000000..23aacd2
--- /dev/null
+++ b/src/libretro-hatari-git/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
+
+pkgname=libretro-hatari-git
+pkgver=5425.e99678be
+pkgrel=1
+pkgdesc="libretro implementation of Hatari v1.8 (Atari ST/STE/TT/Falcon)"
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
+url="https://github.com/libretro/hatari"
+license=('GPL2')
+groups=('libretro')
+depends=('zlib')
+makedepends=('git')
+
+_libname=hatari_libretro
+_gitname=hatari
+source=("git+https://github.com/libretro/${_gitname}.git"
+	"https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
+sha256sums=('SKIP'
+	'SKIP')
+
+pkgver() {
+  cd "${_gitname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+build() {
+  cd ${_gitname}
+  make -f Makefile.libretro
+}
+
+package() {
+  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
+  install -Dm644 "${_libname}.info" "${pkgdir}/usr/lib/libretro/${_libname}.info"
+}
diff --git a/src/libretro-prosystem-git/.SRCINFO b/src/libretro-prosystem-git/.SRCINFO
new file mode 100644
index 0000000..9d27eb5
--- /dev/null
+++ b/src/libretro-prosystem-git/.SRCINFO
@@ -0,0 +1,23 @@
+# Generated by mksrcinfo v8
+# Wed Dec 28 07:16:07 UTC 2016
+pkgbase = libretro-prosystem-git
+	pkgdesc = libretro implementation of ProSystem. (Atari 7800)
+	pkgver = 116.b6f7c1b
+	pkgrel = 1
+	url = https://github.com/libretro/prosystem-libretro
+	arch = i686
+	arch = x86_64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	groups = libretro
+	license = GPL2
+	makedepends = git
+	depends = zlib
+	source = git+https://github.com/libretro/prosystem-libretro.git
+	source = https://raw.github.com/libretro/libretro-super/master/dist/info/prosystem_libretro.info
+	sha256sums = SKIP
+	sha256sums = SKIP
+
+pkgname = libretro-prosystem-git
+
diff --git a/src/libretro-prosystem-git/PKGBUILD b/src/libretro-prosystem-git/PKGBUILD
new file mode 100644
index 0000000..99abd87
--- /dev/null
+++ b/src/libretro-prosystem-git/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Oliver Jaksch <arch-aur@com-in.de>
+
+pkgname=libretro-prosystem-git
+pkgver=116.b6f7c1b
+pkgrel=1
+pkgdesc="libretro implementation of ProSystem. (Atari 7800)"
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
+url="https://github.com/libretro/prosystem-libretro"
+license=('GPL2')
+groups=('libretro')
+depends=('zlib')
+makedepends=('git')
+
+_libname=prosystem_libretro
+_gitname=prosystem-libretro
+source=("git+https://github.com/libretro/${_gitname}.git"
+	"https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
+sha256sums=('SKIP'
+	'SKIP')
+
+pkgver() {
+  cd "${_gitname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+build() {
+  cd "${_gitname}"
+  make
+}
+
+package() {
+  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
+  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
+}
diff --git a/src/libretro-snes9x2010-git/.SRCINFO b/src/libretro-snes9x2010-git/.SRCINFO
new file mode 100644
index 0000000..5695b36
--- /dev/null
+++ b/src/libretro-snes9x2010-git/.SRCINFO
@@ -0,0 +1,21 @@
+# Generated by mksrcinfo v8
+# Tue Nov 22 20:32:23 UTC 2016
+pkgbase = libretro-snes9x2010-git
+	pkgdesc = libretro implementation of Snes9x Next. (Super Nintendo Entertainment System)
+	pkgver = 829.ac2c080
+	pkgrel = 1
+	url = https://github.com/libretro/snes9x2010
+	arch = i686
+	arch = x86_64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	license = custom
+	makedepends = git
+	source = git+https://github.com/libretro/snes9x2010.git
+	source = https://raw.github.com/libretro/libretro-super/master/dist/info/snes9x2010_libretro.info
+	md5sums = SKIP
+	md5sums = f21f6154247bda5eae3bb8f4438e86b2
+
+pkgname = libretro-snes9x2010-git
+
diff --git a/src/libretro-snes9x2010-git/PKGBUILD b/src/libretro-snes9x2010-git/PKGBUILD
new file mode 100644
index 0000000..e400b9e
--- /dev/null
+++ b/src/libretro-snes9x2010-git/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer : Johnathan Jenkins <twodopeshaggy@gmail.com>
+# Contributor:  prettyvanilla <prettyvanilla@posteo.at>
+# Contributor: almostalive   <almostalive2003 at gmail dot com>
+
+pkgname=libretro-snes9x2010-git
+pkgver=841.66ba123
+pkgrel=1
+pkgdesc="libretro implementation of Snes9x Next. (Super Nintendo Entertainment System)"
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
+url="https://github.com/libretro/snes9x2010"
+license=('custom')
+makedepends=('git')
+
+_libname=snes9x2010_libretro
+_gitname=snes9x2010
+source=("git+https://github.com/libretro/${_gitname}.git"
+        "https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
+md5sums=('SKIP'
+         'f21f6154247bda5eae3bb8f4438e86b2')
+
+pkgver() {
+  cd "${_gitname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+build() {
+  cd "${_gitname}"
+  make -f Makefile.libretro
+}
+
+package() {
+  install -Dm644 "${_gitname}/docs/snes9x-license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
+  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
+  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
+}
diff --git a/src/libretro-stella-git/.SRCINFO b/src/libretro-stella-git/.SRCINFO
new file mode 100644
index 0000000..f142086
--- /dev/null
+++ b/src/libretro-stella-git/.SRCINFO
@@ -0,0 +1,22 @@
+# Generated by mksrcinfo v8
+# Sat Dec 10 04:46:33 UTC 2016
+pkgbase = libretro-stella-git
+	pkgdesc = libretro implementation of Stella. (Atari 2600)
+	pkgver = 161.1207fe7
+	pkgrel = 1
+	url = https://github.com/libretro/stella-libretro
+	arch = i686
+	arch = x86_64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	groups = libretro
+	license = GPL2
+	makedepends = git
+	source = git+https://github.com/libretro/stella-libretro.git
+	source = https://raw.github.com/libretro/libretro-super/master/dist/info/stella_libretro.info
+	sha256sums = SKIP
+	sha256sums = SKIP
+
+pkgname = libretro-stella-git
+
diff --git a/src/libretro-stella-git/PKGBUILD b/src/libretro-stella-git/PKGBUILD
new file mode 100644
index 0000000..5f78f17
--- /dev/null
+++ b/src/libretro-stella-git/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
+
+pkgname=libretro-stella-git
+pkgver=161.1207fe7
+pkgrel=1
+pkgdesc="libretro implementation of Stella. (Atari 2600)"
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
+url="https://github.com/libretro/stella-libretro"
+license=('GPL2')
+groups=('libretro')
+makedepends=('git')
+
+_libname=stella_libretro
+_gitname=stella-libretro
+source=("git+https://github.com/libretro/${_gitname}.git"
+	"https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
+sha256sums=('SKIP'
+	'SKIP')
+
+pkgver() {
+  cd "${_gitname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+build() {
+  cd "${_gitname}"
+  make
+}
+
+package() {
+  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
+  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
+}
diff --git a/src/libretro-vba-next-git/.SRCINFO b/src/libretro-vba-next-git/.SRCINFO
new file mode 100644
index 0000000..787da0f
--- /dev/null
+++ b/src/libretro-vba-next-git/.SRCINFO
@@ -0,0 +1,20 @@
+# Generated by mksrcinfo v8
+# Tue Nov 22 20:38:49 UTC 2016
+pkgbase = libretro-vba-next-git
+	pkgdesc = libretro implementation of VBA Next. (Game Boy Advance)
+	pkgver = 479.dbdf841
+	pkgrel = 1
+	url = https://github.com/libretro/vba-next
+	arch = i686
+	arch = x86_64
+	arch = arm
+	arch = armv6h
+	license = GPL
+	makedepends = git
+	source = git+https://github.com/libretro/vba-next.git
+	source = https://raw.github.com/libretro/libretro-super/master/dist/info/vba_next_libretro.info
+	md5sums = SKIP
+	md5sums = SKIP
+
+pkgname = libretro-vba-next-git
+
diff --git a/src/libretro-vba-next-git/PKGBUILD b/src/libretro-vba-next-git/PKGBUILD
new file mode 100644
index 0000000..2f10b5e
--- /dev/null
+++ b/src/libretro-vba-next-git/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer : Johnathan Jenkins <twodopeshaggy@gmail.com>
+# Contributor:  prettyvanilla <prettyvanilla@posteo.at>
+# Contributor: almostalive   <almostalive2003 at gmail dot com>
+
+pkgname=libretro-vba-next-git
+pkgver=680.4578ca6
+pkgrel=1
+pkgdesc="libretro implementation of VBA Next. (Game Boy Advance)"
+arch=('i686' 'x86_64' 'arm' 'armv6h')
+url="https://github.com/libretro/vba-next"
+license=('GPL')
+makedepends=('git')
+
+_libname=vba_next_libretro
+_gitname=vba-next
+source=("git+https://github.com/libretro/${_gitname}.git"
+        "https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
+md5sums=('SKIP'
+         'SKIP')
+
+pkgver() {
+  cd "${_gitname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+build() {
+  cd "${_gitname}"
+  make -f Makefile.libretro
+}
+
+package() {
+  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
+  install -Dm644 "${_libname}.info" "${pkgdir}/usr/share/libretro/info/${_libname}.info"
+}
diff --git a/src/libretro-virtualjaguar-git/.SRCINFO b/src/libretro-virtualjaguar-git/.SRCINFO
new file mode 100644
index 0000000..d467945
--- /dev/null
+++ b/src/libretro-virtualjaguar-git/.SRCINFO
@@ -0,0 +1,22 @@
+# Generated by mksrcinfo v8
+# Fri Sep 16 02:49:52 UTC 2016
+pkgbase = libretro-virtualjaguar-git
+	pkgdesc = libretro implementation of Virtual Jaguar. (Atari Jaguar)
+	pkgver = 151.8be4390
+	pkgrel = 1
+	url = https://github.com/libretro/virtualjaguar-libretro
+	arch = i686
+	arch = x86_64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	groups = libretro
+	license = GPL3
+	makedepends = git
+	source = git+https://github.com/libretro/virtualjaguar-libretro.git
+	source = https://raw.github.com/libretro/libretro-super/master/dist/info/virtualjaguar_libretro.info
+	sha256sums = SKIP
+	sha256sums = SKIP
+
+pkgname = libretro-virtualjaguar-git
+
diff --git a/src/libretro-virtualjaguar-git/PKGBUILD b/src/libretro-virtualjaguar-git/PKGBUILD
new file mode 100644
index 0000000..6693771
--- /dev/null
+++ b/src/libretro-virtualjaguar-git/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Oliver Jaksch <arch-aur@com-in.de>
+
+pkgname=libretro-virtualjaguar-git
+pkgver=153.4e6cbaf
+pkgrel=1
+pkgdesc="libretro implementation of Virtual Jaguar. (Atari Jaguar)"
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
+url="https://github.com/libretro/virtualjaguar-libretro"
+license=('GPL3')
+groups=('libretro')
+makedepends=('git')
+
+_libname=virtualjaguar_libretro
+_gitname=virtualjaguar-libretro
+source=("git+https://github.com/libretro/${_gitname}.git"
+	"https://raw.github.com/libretro/libretro-super/master/dist/info/${_libname}.info")
+sha256sums=('SKIP'
+	'SKIP')
+
+pkgver() {
+  cd "${_gitname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+build() {
+  cd "${_gitname}"
+  make
+}
+
+package() {
+  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
+  install -Dm644 "${_libname}.info" "${pkgdir}/usr/lib/libretro/${_libname}.info"
+}
diff --git a/src/xboxdrv/.SRCINFO b/src/xboxdrv/.SRCINFO
new file mode 100644
index 0000000..2669efb
--- /dev/null
+++ b/src/xboxdrv/.SRCINFO
@@ -0,0 +1,28 @@
+# Generated by mksrcinfo v8
+# Wed Jun  1 10:54:51 UTC 2016
+pkgbase = xboxdrv
+	pkgdesc = Userspace gamepad driver for Linux
+	pkgver = 0.8.8
+	pkgrel = 2
+	url = http://pingus.seul.org/~grumbel/xboxdrv
+	arch = i686
+	arch = x86_64
+	license = GPL3
+	makedepends = scons
+	makedepends = boost
+	makedepends = pkg-config
+	makedepends = libx11
+	depends = libx11
+	depends = dbus-glib
+	depends = libusb
+	depends = python2-dbus
+	backup = etc/default/xboxdrv
+	source = xboxdrv-0.8.8.tar.gz::https://github.com/xboxdrv/xboxdrv/archive/v0.8.8.tar.gz
+	source = xboxdrv.service
+	source = xboxdrv.default
+	sha512sums = 3f27856da211a14e27a84fa5919da7965262adc36da16c75eed9bae891098183b5751a3e707573b4ab64e69096ea74d455e8f64827c88b38b65af94cc13b34ad
+	sha512sums = f1a4e7b1a06e951c3a4f5bcdec5f14db542b34963950619f0d4b1ee324d64b18ca2f63642719ef65a63e424702fb0eb33e0259937906732e587b96a9582c2e6b
+	sha512sums = 4f6e9a12b208254e19daba477dd7787147a8b2c8a83007d92f8cfce6212c21ce3306f23a2669080f0e46986ca102ab08c262b42c678caf1a891326b4e2c40b5f
+
+pkgname = xboxdrv
+
diff --git a/src/xboxdrv/PKGBUILD b/src/xboxdrv/PKGBUILD
new file mode 100644
index 0000000..828fc1c
--- /dev/null
+++ b/src/xboxdrv/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Jack Mitchell <jack@embed.me.uk>
+# Contributor: Kevin MacMartin <prurigro at gmail dot com>
+
+pkgname=xboxdrv
+pkgver=0.8.8
+pkgrel=2
+pkgdesc='Userspace gamepad driver for Linux'
+url='http://pingus.seul.org/~grumbel/xboxdrv'
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('libx11' 'dbus-glib' 'libusb' 'python2-dbus')
+makedepends=('scons' 'boost' 'pkg-config' 'libx11')
+backup=("etc/default/${pkgname}")
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xboxdrv/${pkgname}/archive/v${pkgver}.tar.gz
+        ${pkgname}.service
+        ${pkgname}.default)
+sha512sums=('3f27856da211a14e27a84fa5919da7965262adc36da16c75eed9bae891098183b5751a3e707573b4ab64e69096ea74d455e8f64827c88b38b65af94cc13b34ad'
+            'f1a4e7b1a06e951c3a4f5bcdec5f14db542b34963950619f0d4b1ee324d64b18ca2f63642719ef65a63e424702fb0eb33e0259937906732e587b96a9582c2e6b'
+            '4f6e9a12b208254e19daba477dd7787147a8b2c8a83007d92f8cfce6212c21ce3306f23a2669080f0e46986ca102ab08c262b42c678caf1a891326b4e2c40b5f')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed 's|python|python2|g' -i examples/*.py
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  scons \
+    LINKFLAGS="${LDFLAGS}" \
+    CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" \
+    "${MAKEFLAGS}"
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make PREFIX=/usr DESTDIR="${pkgdir}" install
+  install -Dm 644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -Dm 644 "${srcdir}/${pkgname}.default" "${pkgdir}/etc/default/${pkgname}"
+  install -Dm 644 README.md NEWS PROTOCOL -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -Dm 644 examples/* -t "${pkgdir}/usr/share/doc/${pkgname}/examples"
+  install -Dm 644 data/org.seul.Xboxdrv.conf -t "${pkgdir}/etc/dbus-1/system.d"
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/src/xboxdrv/xboxdrv.default b/src/xboxdrv/xboxdrv.default
new file mode 100644
index 0000000..ced6554
--- /dev/null
+++ b/src/xboxdrv/xboxdrv.default
@@ -0,0 +1,5 @@
+[xboxdrv]
+silent = true
+next-controller = true
+[xboxdrv-daemon]
+dbus = disabled
diff --git a/src/xboxdrv/xboxdrv.service b/src/xboxdrv/xboxdrv.service
new file mode 100644
index 0000000..538fe94
--- /dev/null
+++ b/src/xboxdrv/xboxdrv.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Xbox controller driver daemon
+Documentation=man:xboxdrv(1)
+
+[Service]
+Type=forking
+User=root
+PIDFile=/var/run/xboxdrv.pid
+ExecStart=/usr/bin/xboxdrv --daemon --detach --pid-file /var/run/xboxdrv.pid -c /etc/default/xboxdrv --detach-kernel-driver --deadzone 4000 --deadzone-trigger 10%
+
+[Install]
+WantedBy=multi-user.target