diff --git a/src/ampache-git/PKGBUILD b/src/ampache-git/PKGBUILD
index c8ab618..90e9ba1 100644
--- a/src/ampache-git/PKGBUILD
+++ b/src/ampache-git/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=ampache-git
 _gitname=ampache
-pkgver=3.8.2.261.g011b2b86
-pkgrel=1
+pkgver=3.8.1.7.g799165a
+pkgrel=2
 pkgdesc="A PHP-based tool for managing and playing your audio/video files via a web interface"
 arch=('i686' 'x86_64')
 url="http://www.ampache.org/"
diff --git a/src/argtable/PKGBUILD b/src/argtable/PKGBUILD
index ab7b3b7..a0ad288 100644
--- a/src/argtable/PKGBUILD
+++ b/src/argtable/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="An ANSI C command line parser"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://argtable.sourceforge.net/"
 license=('LGPL')
-source=(http://downloads.sourceforge.net/argtable/$pkgname${pkgver/./-}.tar.gz)
+source=(https://downloads.sourceforge.net/argtable/$pkgname${pkgver/./-}.tar.gz)
 sha1sums=('bce828c64c35e16f4c3f8e1f355e4a2a97fe3289')
 
 build() {
diff --git a/src/aurutils/0001-aurbuild-backport-fix-for-236.patch b/src/aurutils/0001-aurbuild-backport-fix-for-236.patch
new file mode 100644
index 0000000..5ab99e7
--- /dev/null
+++ b/src/aurutils/0001-aurbuild-backport-fix-for-236.patch
@@ -0,0 +1,40 @@
+From 07d302de1d48e2daea193d9a3a2931331c8abce0 Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@mailbox.org>
+Date: Fri, 6 Oct 2017 23:03:14 +0200
+Subject: [PATCH 1/2] aurbuild: backport fix for #236
+
+---
+ bin/aurbuild | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/bin/aurbuild b/bin/aurbuild
+index 05df8b0..4672372 100755
+--- a/bin/aurbuild
++++ b/bin/aurbuild
+@@ -110,6 +110,7 @@ root=$(canonicalize_path "${root-$server}")
+ if [[ -w $root/ && -r $root/ ]]; then
+     # File: custom.db -> custom.db.tar
+     db_path=$(readlink -f "$root/$database".db)
++    files_path=$(readlink -f "$root/$database".files)
+ else
+     error "$argv0: $root: permission denied"
+     exit 13
+@@ -168,8 +169,13 @@ while read -r -u "$fd" pkg _; do
+ 
+     # https://github.com/vodik/repose/issues/46
+     if ((sign_pkg)); then
+-        gpg "${gpg_args[@]}" --output "$var_tmp/${db_path##*/}".sig "$db_path"
+-        mv -bv "$var_tmp/${db_path##*/}".sig -t "$root"
++        for i in "$db_path" "$files_path"; do
++            # https://github.com/AladW/aurutils/issues/236
++            i_sig=$var_tmp/${i##*/}.sig
++
++            gpg "${gpg_args[@]}" --output "$i_sig" "$i"
++            mv -bv "$i_sig" -t "$root"
++        done
+     fi
+ 
+     if ((chroot)); then
+-- 
+2.14.2
+
diff --git a/src/aurutils/0002-aurbuild-disable-verbose-signing.patch b/src/aurutils/0002-aurbuild-disable-verbose-signing.patch
new file mode 100644
index 0000000..6461434
--- /dev/null
+++ b/src/aurutils/0002-aurbuild-disable-verbose-signing.patch
@@ -0,0 +1,25 @@
+From 1e16b62746576f594a5da9859a8a58e5f5be74f1 Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@mailbox.org>
+Date: Fri, 6 Oct 2017 23:10:04 +0200
+Subject: [PATCH 2/2] aurbuild: disable verbose signing
+
+---
+ bin/aurbuild | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/aurbuild b/bin/aurbuild
+index 4672372..951a9ba 100755
+--- a/bin/aurbuild
++++ b/bin/aurbuild
+@@ -4,7 +4,7 @@ readonly basedir=$PWD
+ readonly PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
+ set -e
+ 
+-declare -a gpg_args=(--detach-sign --no-armor --verbose --batch)
++declare -a gpg_args=(--detach-sign --no-armor --batch)
+ declare -a makechrootpkg_args=(-cnu) makepkg_args=(-Lcrs)
+ declare -i chroot=0 sign_pkg=0
+ 
+-- 
+2.14.2
+
diff --git a/src/aurutils/0003-aursync-1-r-is-not-a-default-option.patch b/src/aurutils/0003-aursync-1-r-is-not-a-default-option.patch
new file mode 100644
index 0000000..2d263f8
--- /dev/null
+++ b/src/aurutils/0003-aursync-1-r-is-not-a-default-option.patch
@@ -0,0 +1,25 @@
+From 20dc81ad04a647ef66b08c274590666554df40c9 Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@mailbox.org>
+Date: Sat, 14 Oct 2017 16:59:57 +0200
+Subject: [PATCH] aursync(1): -r is not a default option
+
+---
+ man1/aursync.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man1/aursync.1 b/man1/aursync.1
+index 5569c36..82b8d82 100644
+--- a/man1/aursync.1
++++ b/man1/aursync.1
+@@ -78,7 +78,7 @@ value of the configured repository.
+ .RE
+ 
+ .SS makepkg
+-The default set of options is \fImakepkg -Lcrs\fR.
++The default set of options is \fImakepkg -Lcs\fR.
+ 
+ .B \-f, --force
+ .RS
+-- 
+2.14.2
+
diff --git a/src/aurutils/PKGBUILD b/src/aurutils/PKGBUILD
index 77db860..02879b6 100644
--- a/src/aurutils/PKGBUILD
+++ b/src/aurutils/PKGBUILD
@@ -1,13 +1,12 @@
+# Maintainer: Alad Wenter <alad@mailbox.org>
 pkgname=aurutils
 pkgver=1.5.3
-_commit=01cbab783489eefc1859287bd0cb898de40c8100 # 1.5.3
-pkgrel=2
+pkgrel=5
 pkgdesc='helper tools for the arch user repository'
 arch=('any')
-url=https://github.com/AladW/aurutils
-license=('ISC')
+url='https://github.com/AladW/aurutils'
+license=('custom:ISC')
 depends=('pacman>=5' 'git' 'jq' 'pacutils>=0.4')
-checkdepends=('shellcheck')
 makedepends=('git')
 optdepends=('devtools: systemd-nspawn support'
             'vifm: build file interaction'
@@ -15,10 +14,28 @@ optdepends=('devtools: systemd-nspawn support'
             'parallel: threaded downloads'
             'expac: aursift script'
             'repose: repo-add alternative')
-source=("$pkgname-$pkgver::git+$url#commit=$_commit")
-sha256sums=('SKIP')
+_backports=('0001-aurbuild-backport-fix-for-236.patch'
+            '0002-aurbuild-disable-verbose-signing.patch'
+            '0003-aursync-1-r-is-not-a-default-option.patch')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+        "$pkgname-$pkgver.tar.gz.asc::$url/releases/download/$pkgver/$pkgver.tar.gz.asc"
+        "${_backports[@]}")
+sha256sums=('a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5'
+            'SKIP'
+            '5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86'
+            'f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb'
+            '43180210b22268ab5b54563541804dec74c08587e77870e527b736cb4f62d4a1')
+# Alad Wenter <alad@mailbox.org>
+validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A')
+
+prepare() {
+    cd "$pkgname-$pkgver"
+    for p in "${_backports[@]}"; do
+        patch -p1 < "$srcdir/$p"
+    done
+}
 
 package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" PREFIX="/usr" install
+    cd "$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" PREFIX="/usr" install
 }
diff --git a/src/biboumi-git/PKGBUILD b/src/biboumi-git/PKGBUILD
index bf30c8b..7015177 100644
--- a/src/biboumi-git/PKGBUILD
+++ b/src/biboumi-git/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=biboumi
 pkgname="$_pkgname-git"
-pkgver=r1102.b71ca15
+pkgver=r1087.5ba66c3
 pkgrel=1
 pkgdesc="XMPP gateway to IRC"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
diff --git a/src/binfmt-support/PKGBUILD b/src/binfmt-support/PKGBUILD
index f65d7e8..1328732 100644
--- a/src/binfmt-support/PKGBUILD
+++ b/src/binfmt-support/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=binfmt-support
-pkgver=2.1.7
+pkgver=2.1.8
 pkgrel=1
 pkgdesc="register interpreters for various binary formats"
 arch=(i686 x86_64)
@@ -7,9 +7,9 @@ url="http://packages.debian.org/en/sid/binfmt-support"
 license=('GPL')
 depends=('libpipeline')
 makedepends=()
-source=(http://ftp.de.debian.org/debian/pool/main/b/binfmt-support/binfmt-support_$pkgver.orig.tar.gz
+source=(ftp://ftp.de.debian.org/debian/pool/main/b/binfmt-support/binfmt-support_$pkgver.orig.tar.gz
 	binfmt-support.service)
-sha256sums=('7ca0d0009220b9213e4637f4bbdc3c0030b0548eb9bbcd56e0a99876fa879a55'
+sha256sums=('ebad04db8444d2275d042b5074fa3e160bcf3e2c23ee9b660e75f5acd73618a2'
             'efba2300b9f0c8c5c14696d2b25836d91edaaad8d30c64ed7d3eab0163b2553e')
 
 build() {
diff --git a/src/comskip/PKGBUILD b/src/comskip/PKGBUILD
index 200b24e..4775660 100644
--- a/src/comskip/PKGBUILD
+++ b/src/comskip/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Nick Burrett <nick@sqrt.co.uk>
 pkgname=comskip
-pkgver=0.81.095
-pkgrel=3
+pkgver=0.82.002
+pkgrel=1
 epoch=1
 pkgdesc='Comskip is a free MPEG commercial break detector'.
 _gitname='comskip'
@@ -13,7 +13,7 @@ depends=('ffmpeg' 'argtable')
 source=("${_gitname}::git+https://github.com/erikkaashoek/Comskip#commit=0bf473cb5be4b754f01f95fb3cffd120f5f1985a"
         "comskip-version.patch")
 sha256sums=('SKIP'
-            '79e992be77b0408dfe8651022f9784bf02336326b0ec4cc636ac2ebed690e134')
+            '7bf06bef3c4d26b6aad1bd0714b2b365bbd0c76bb491bf8ec42d8752ff442cd0')
 
 prepare() {
   cd "${srcdir}/${_gitname}"
diff --git a/src/comskip/comskip-version.patch b/src/comskip/comskip-version.patch
index c502536..cbd97b0 100644
--- a/src/comskip/comskip-version.patch
+++ b/src/comskip/comskip-version.patch
@@ -2,7 +2,7 @@
 +++ comskip/configure.ac	2017-05-12 16:57:43.845506928 +0100
 @@ -1,4 +1,4 @@
 -AC_INIT([Comskip], [0.81.089], [https://github.com/erikkaashoek/Comskip/issues])
-+AC_INIT([Comskip], [0.81.095], [https://github.com/erikkaashoek/Comskip/issues])
++AC_INIT([Comskip], [0.82.002], [https://github.com/erikkaashoek/Comskip/issues])
  AM_INIT_AUTOMAKE([-Wall -Werror foreign])
  
  : ${CFLAGS=""}
diff --git a/src/emulationstation-autoscraper/PKGBUILD b/src/emulationstation-autoscraper/PKGBUILD
index cde5825..9bc47ba 100644
--- a/src/emulationstation-autoscraper/PKGBUILD
+++ b/src/emulationstation-autoscraper/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=emulationstation-autoscraper
-pkgver=246.7bce4f9
+pkgver=273.ca24b2b
 pkgrel=1
 pkgdesc="An auto-scraper for EmulationStation written in Go using hashes"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
diff --git a/src/emulationstation-git/PKGBUILD b/src/emulationstation-git/PKGBUILD
index d509096..afbce44 100644
--- a/src/emulationstation-git/PKGBUILD
+++ b/src/emulationstation-git/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=emulationstation-git
 _gitname=EmulationStation
 pkgrel=1
-pkgver=961.6722c34
+pkgver=1034.99c1ddb
 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/RetroPie/EmulationStation"
@@ -47,6 +47,4 @@ 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"
 }
-
diff --git a/src/gajim-plugin-omemo/PKGBUILD b/src/gajim-plugin-omemo/PKGBUILD
index dee8c2b..da6341b 100644
--- a/src/gajim-plugin-omemo/PKGBUILD
+++ b/src/gajim-plugin-omemo/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gajim-plugin-omemo
 _pkgname=omemo
-pkgver=1.2.4
+pkgver=1.2.8
 pkgrel=1
 pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption."
 arch=(any)
@@ -11,8 +11,8 @@ license=('GPL')
 depends=("gajim" "python2-qrcode" "python2-setuptools" "python2-cryptography" "python2-axolotl" "python2-future")
 provides=('gajim-plugin-omemo')
 conflicts=('gajim-plugin-omemo-git')
-source=("${_pkgname}-${pkgver}.zip::https://ftp.gajim.org/plugins_0.16_zip/${_pkgname}.zip")
-sha512sums=(SKIP)
+source=("https://dev.gajim.org/gajim/gajim-plugins/uploads/0bbc71f9c33d7a450c6bb7704006e0bc/omemo_1.2.8.zip")
+sha512sums=('bdc50faac655306cc5b791edd238518d52f31bda6739f1d0411757835491ee6bf7e87dfffff9b1a57b74b4ed3b0309c97d23cd1615f7f45ef530d3655636cfa4')
 
 package() {
   cd ${srcdir}/${_pkgname}
diff --git a/src/intellij-idea-ultimate-edition/PKGBUILD b/src/intellij-idea-ultimate-edition/PKGBUILD
index 5149d00..40f791e 100644
--- a/src/intellij-idea-ultimate-edition/PKGBUILD
+++ b/src/intellij-idea-ultimate-edition/PKGBUILD
@@ -2,51 +2,47 @@
 
 pkgbase=intellij-idea-ultimate-edition
 pkgname=(intellij-idea-ultimate-edition intellij-idea-ultimate-edition-jre)
-pkgver=2017.2.2
-_buildver=172.3757.52
-pkgrel=2
+pkgver=2017.2.6
+_buildver=172.4574.11
+pkgrel=1
 arch=('any')
 pkgdesc="An intelligent IDE for Java, Groovy and other programming languages with advanced refactoring features intensely focused on developer productivity."
 url="https://www.jetbrains.com/idea/"
 license=('Commercial')
-depends=('java-environment' 'giflib' 'libxtst')
-makedepends=('rsync')
 options=(!strip)
-source=(https://download.jetbrains.com/idea/ideaIU-$pkgver.tar.gz \
-        jetbrains-idea.desktop
-)
-sha256sums=('b5f33894abbf31786a17779bc11bfbe05f46cbbcd516fc2d48590411c44be95c'
+install=$pkgbase.install
+source=("https://download.jetbrains.com/idea/ideaIU-$pkgver.tar.gz"
+        "jetbrains-idea.desktop")
+sha256sums=('565f44d1b955844a11010c4735fa7adfb5aba20327b2424897382ff487344ede'
             '83af2ba8f9f14275a6684e79d6d4bd9b48cd852c047dacfc81324588fa2ff92b')
+
+prepare() {
+  # Extract the JRE from the main pacakge
+  mv idea-IU-$_buildver/jre64 "$srcdir"/jre64
+}
+
 package_intellij-idea-ultimate-edition() {
-  backup=("usr/share/${pkgname}/bin/idea.vmoptions" "usr/share/${pkgname}/bin/idea64.vmoptions" "usr/share/${pkgname}/bin/idea.properties")
+  backup=("opt/$pkgname/bin/idea.vmoptions" "opt/${pkgname}/bin/idea64.vmoptions" "opt/${pkgname}/bin/idea.properties")
+  depends=('giflib' 'libxtst')
+  optdepends=('intellij-idea-ultimate-edition-jre: JetBrains custom JRE (Recommended)' 'java-environment: Required if intellij-idea-ultimate-edition-jre is not installed')
+
   cd "$srcdir"
 
-  install -d -m755 "${pkgdir}"/usr/{bin,share}
-  rsync -rtl "idea-IU-${_buildver}/" "${pkgdir}/usr/share/${pkgbase}" --exclude=/jre64
+  install -d "$pkgdir"/{opt/$pkgname,usr/bin}
+  mv idea-IU-${_buildver}/* "$pkgdir"/opt/$pkgbase
 
-  # make sure that all files are owned by root
-  chown -R root:root "${pkgdir}/usr/share"
-
-  find "$pkgdir"/usr/share/"$pkgname" -type d -exec chmod 0755 {} ';'
-  find "$pkgdir"/usr/share/"$pkgname" -type f -exec chmod 0644 {} ';'
-
-  chmod +x "$pkgdir"/usr/share/"$pkgname"/bin/idea.sh
-  chmod +x "$pkgdir"/usr/share/"$pkgname"/bin/fsnotifier
-  chmod +x "$pkgdir"/usr/share/"$pkgname"/bin/fsnotifier64
-  chmod +x "$pkgdir"/usr/share/"$pkgname"/bin/fsnotifier-arm
-
-  ln -s /usr/share/"$pkgname"/bin/idea.sh "$pkgdir"/usr/bin/"$pkgname"
+  ln -s /opt/$pkgname/bin/idea.sh "$pkgdir"/usr/bin/$pkgname
   install -D -m644 "$srcdir"/jetbrains-idea.desktop "$pkgdir"/usr/share/applications/jetbrains-idea.desktop
-  install -D -m644 "$srcdir"/idea-IU-$_buildver/bin/idea.png "$pkgdir"/usr/share/pixmaps/"$pkgname".png
+  install -D -m644 "$pkgdir"/opt/$pkgbase/bin/idea.png "$pkgdir"/usr/share/pixmaps/"$pkgname".png
 
   # workaround FS#40934
-  sed -i 's|lcd|on|'  "$pkgdir"/usr/share/"$pkgname"/bin/*.vmoptions
+  sed -i 's|lcd|on|'  "$pkgdir"/opt/$pkgname/bin/*.vmoptions
 }
 
 package_intellij-idea-ultimate-edition-jre() {
   arch=('x86_64')
-  install -d -m 755 "${pkgdir}/usr/share/${pkgbase}"
-  rsync -rtl "${srcdir}/idea-IU-${_buildver}/jre64" "${pkgdir}/usr/share/${pkgbase}"
+  install -d -m 755 "$pkgdir"/opt/$pkgbase
+  mv "$srcdir"/jre64 "$pkgdir"/opt/$pkgbase
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/src/intellij-idea-ultimate-edition/intellij-idea-ultimate-edition.install b/src/intellij-idea-ultimate-edition/intellij-idea-ultimate-edition.install
new file mode 100644
index 0000000..3cdd861
--- /dev/null
+++ b/src/intellij-idea-ultimate-edition/intellij-idea-ultimate-edition.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+    echo -e "\033[0;33m\033[1m\tWarning:\033[0m Install location has moved to /opt!"
+    echo -e "\tIf you have modified *.vmoptions or idea.properties, you will need to move them to the new directory by running:\n"
+    echo -e "\tsudo cp -a /usr/share/intellij-idea-ultimate-edition/bin/{*.vmoptions, idea.properties} /opt/intellij-idea-ultimate-edition/bin/"
+}
\ No newline at end of file
diff --git a/src/iucode-tool/PKGBUILD b/src/iucode-tool/PKGBUILD
index 5251c91..c6a56b4 100644
--- a/src/iucode-tool/PKGBUILD
+++ b/src/iucode-tool/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Andreas Bosch <admin@progandy.de>
 pkgname=iucode-tool
-pkgver=2.1.2
+pkgver=2.2
 pkgrel=1
 pkgdesc="Tool to manipulate Intel® IA-32/X86-64 microcode bundles"
 arch=(x86_64 i686)
@@ -10,7 +10,7 @@ makedepends=()
 source=("https://gitlab.com/iucode-tool/releases/raw/master/${pkgname}_${pkgver}.tar.xz"
     "https://gitlab.com/iucode-tool/releases/raw/master/${pkgname}_${pkgver}.tar.xz.asc")
 noextract=()
-sha256sums=('01f1c02ba6935e0ac8440fb594c2ef57ce4437fcbce539e3ef329f55a6fd71ab'
+sha256sums=('9810daf925b8a9ca244adc4e1916bcab65601c9ebe87e91c2281f78055982971'
             'SKIP')
 validpgpkeys=('C467A717507BBAFED3C160920BD9E81139CB4807') # Henrique de Moraes Holschuh <hmh@hmh.eng.br>
 
diff --git a/src/jdk-devel/LICENSE-Early-Adopter-Development-Agreement.txt b/src/jdk-devel/LICENSE-Early-Adopter-Development-Agreement.txt
new file mode 100644
index 0000000..053a766
--- /dev/null
+++ b/src/jdk-devel/LICENSE-Early-Adopter-Development-Agreement.txt
@@ -0,0 +1,95 @@
+Oracle Technology Network Early Adopter Development License Agreement
+
+EXPORT CONTROLS
+Export laws and regulations of the United States and any other relevant local export laws and regulations apply to the Oracle Technology.  You agree that such export control laws govern Your use of the Oracle Technology (including technical data) and any services deliverables provided under this agreement, and You agree to comply with all such export laws and regulations (including “deemed export” and  “deemed re-export” regulations).  You agree that no data, information, program and/or materials resulting from services (or direct product thereof) will be exported, directly or indirectly, in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology.
+
+Accordingly, You confirm:
+
+-You will not download, provide, make available or otherwise export or re-export the Oracle Technology, directly or indirectly, to countries prohibited by applicable laws and regulations nor to citizens, nationals or residents of those countries.
+
+-You are not listed on the United States Department of Treasury lists of Specially Designated Nationals and Blocked Persons, Specially Designated Terrorists, and Specially Designated Narcotic Traffickers, nor are You listed on the United States Department of Commerce Table of Denial Orders.
+
+- You will not download or otherwise export or re-export the Oracle Technology, directly or indirectly, to persons on the above mentioned lists.
+
+- You will not use the Oracle Technology for, and will not allow the Oracle Technology to be used for, any purposes prohibited by applicable law, including, without limitation, for the development, design, manufacture or production of nuclear, chemical or biological weapons of mass destruction.
+
+Oracle Employees: Under no circumstances are Oracle Employees authorized to download software for the purpose of distributing it to customers. Oracle products are available to employees for internal use or demonstration purposes only. In keeping with Oracle's trade compliance obligations under U.S. and applicable multilateral law, failure to comply with this policy could result in disciplinary action up to and including termination.
+
+Note: You are bound by the Oracle Technology Network ("OTN") Early Adopter Development License Agreement (“OTN License Agreement”) terms. The OTN License Agreement terms also apply to all updates You receive under Your Technology Track subscription.
+
+The OTN License Agreement terms below supercede any shrinkwrap license on the OTN Technology Track software CDs and previous OTN License terms (including the Oracle Program License as modified by the OTN Program Use Certificate).
+
+PLEASE READ THE FOLLOWING LICENSE AGREEMENT TERMS AND CONDITIONS CAREFULLY BEFORE ACCESSING, DOWNLOADING, INSTALLING OR USING THE ORACLE TECHNOLOGY. THESE TERMS AND CONDITIONS CONSTITUTE A LEGAL AGREEMENT BETWEEN YOU AND ORACLE.
+
+Oracle Technology Network Early Adopter Development License Agreement
+
+"Oracle,” We," "Us," and "Our" refers to Oracle America, Inc., for and on behalf of itself and its subsidiaries and affiliates under common control. "You" and "Your" refers to the individual or entity, for which You are an authorized representative with full authority to enter into this agreement on behalf of, that wishes to use the Programs. "Programs" refers to the pre-production version of the Oracle software product You wish to access and use or download and use, including program documentation, if any. “Supplemental Programs” refer to any supplemental Oracle production software as may be provided by Oracle for operation of the Programs. If included, Supplemental Programs are listed in Exhibit A to this Agreement. Programs and any Supplemental Programs are collectively “Oracle Technology”. "License" refers to Your right to use the Oracle Technology under the terms of this license agreement. “Oracle Confidential Information” includes the Software, any information related to the Software and Feedback. Oracle Confidential Information shall not include information which: (a) is or becomes a part of the public domain through no act or omission of the other party; or (b) was in the other party’s lawful possession prior to the disclosure and had not been obtained by the other party either directly or indirectly from the disclosing party; or (c) is lawfully disclosed to the other party by a third party without restriction on disclosure; or (d) except for Feedback, is independently developed by You. You agree, both during the term of this Agreement and for a period of three years after termination of this Agreement and of all licenses granted hereunder, to hold Oracle Confidential Information in confidence. You agree not to make Oracle’s Confidential Information available in any form to any unauthorized third parties. You agree to take all reasonable steps to ensure that Confidential Information is not disclosed or distributed by Your employees or agents in violation of the provisions of this Agreement.
+
+This agreement is governed by California law, except for that body of laws related to the conflict of laws. You agree to submit to the exclusive jurisdiction of, and venue in, the courts located in San Francisco or Santa Clara counties in California in any dispute arising out of or relating to this agreement or the Oracle Technology.
+
+In order to use the Oracle Technology, You must first agree to the license terms below by selecting the "Accept License Agreement" (or the equivalent) button below. If You do not or cannot agree to these license terms, You are not permitted to access, download or use the Oracle Technology.
+
+License Rights
+We grant You a revocable, nonexclusive, nontransferable, royalty-free and limited right to (a) use one (1) copy of the binary portions of the Programs and any Supplemental Programs for the sole purpose of internal non-production and non-commercial evaluation and testing of the Programs, including, developing no more than a single prototype of each of Your applications; and (b) if provided by Us at our sole discretion, view the source code portions of the Programs internally for the purposes of evaluation and testing only (collectively, “Authorized Use”).
+
+All rights not expressly granted above are hereby reserved. If You want to use the Oracle Technology for any purpose other than as permitted under this agreement, including but not limited to distribution of the Oracle Technology or the application You develop or any use of the Oracle Technology or the application You develop for Your internal business purposes (other than the Authorized Use), You must obtain a valid Oracle license permitting such use.
+
+You acknowledge that (1) the Programs are not generally available and may have defects, security vulnerabilities, or other deficiencies that may not and/or cannot be corrected by Us and are subject to change at Our sole discretion; and (2) We may not produce a production release version of the Programs and any development efforts undertaken by You are at Your own risk. We may audit Your use of the Oracle Technology.
+
+The Oracle Technology will either be hosted by Oracle or provided to You. In the event that the Oracle Technology are provided to You in a hosted environment, Oracle may provide certain passwords and/or other access information to enable You to access the Oracle Technology. These passwords and/or access information shall be and are Oracle Confidential Information under the terms of this agreement and shall be used solely for the purpose of accessing the Oracle Technology for the evaluation and testing purposes described above. Any hosted instance of the Oracle Technology is provided as is and without warranty. Oracle makes no assurances that any data loaded into the hosted instance will be secured or that such data will remain confidential. Further, Oracle, at its discretion, (a) may access, monitor, and/or review Your activity and data in the hosted instance, and (b) may delete Your files within the hosted instance. Accordingly, Oracle advises You not to place any personal information or other production data into the hosted instance. You agree to take all reasonable steps to prevent improper or unauthorized access to or use of the Oracle Technology.
+
+Collection of Information
+The Oracle Technology may collect certain technical information regarding Your use of the Oracle Technology for the purpose of improving the functionality of the Oracle Technology. Except as set forth above with respect to Oracle-hosted instances of the Oracle Technology, Oracle will comply with its Privacy Policy in effect as data collection services are performed, which is available at http://www.oracle.com/us/legal/privacy/index.html .
+
+Ownership and Restrictions
+We retain all ownership and intellectual property rights in the Oracle Technology. The Oracle Technology may be accessed from the hosted environment or if the Oracle Technology are provided to You, the Oracle Technology may be installed on one computer only, and used by Your employees or agents in the operating environment identified by Us. You may make one copy of the Oracle Technology for backup purposes.
+
+The license grant set forth above is subject to the following additional specific agreements and covenants:
+
+(i) You shall not use the Oracle Technology for training, commercial time-sharing or service bureau use;
+
+(ii) You agree that it will not make copies of the Oracle Technology except for backup purposes;
+
+(iii) You agree not to cause or permit the disassembly, reverse compilation, or reverse engineering of the Oracle Technology, except as otherwise specified by law; and
+
+(iv) You shall not remove any product identification, copyright notices, or other notices or proprietary restrictions from the Oracle Technology.
+
+Feedback 
+”Feedback” shall mean any input provided to Us, in any manner, regarding Oracle’s products, documentation and/or services, including changes or suggested changes to Oracle’s current or future products, documentation, and/or services, and benchmark test results. You grant to Oracle a worldwide, royalty-free, non-exclusive, perpetual, and irrevocable right to use Feedback for any purpose, including but not limited to, incorporation of such Feedback into the Software or other software products without compensation to You. Any Feedback shall be Oracle Confidential Information. You shall not be identified with Feedback if Oracle provides it to a third party.
+
+Export
+You agree to comply fully with export laws and regulations of the United States and any other applicable export laws ("Export Laws") to assure that neither the Software, Confidential Information nor any direct product thereof are:  (1) exported, directly or indirectly, in violation of this Agreement or Export Laws; or (2) used for any purposes prohibited by the Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology.  
+
+Disclaimer of Warranty and Exclusive Remedies
+THE ORACLE TECHNOLOGY IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, ACCURACY, TIMELINESS OR NONINFRINGEMENT.
+
+IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR ENTIRE LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000).
+
+Additional Trial Programs
+We may include additional trial programs with the Programs licensed under this agreement which You download or access in the hosted environment. You will have 30 days from the delivery date or hosted environment access date to evaluate these additional trial programs. Any use of these trial programs after the 30 day trial period requires You to obtain the applicable license. Any additional trial programs are provided "as is" and We do not provide technical support or any warranties for these programs.
+
+No Technical Support
+Our technical support organization will not provide technical support, phone support, or updates to You for the Oracle Technology licensed under this agreement.
+
+End of Agreement
+This agreement, and Your right to use the Programs, will be terminated: (i) automatically upon the general commercial availability of the Programs, or six months from the date You download the Programs, whichever is first to occur, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control; (ii) by You, by ceasing to use and destroying all copies of the Oracle Technology in Your possession or control; or, (iii) by Us if You fail to comply with any of the terms of this agreement, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control.
+
+Relationship Between the Parties
+The relationship between You and Us is that of licensee/licensor. Neither party will represent that it has any authority to assume or create any obligation, express or implied, on behalf of the other party, nor to represent the other party as agent, employee, franchisee, or in any other capacity. Nothing in this agreement shall be construed to limit either party's right to independently develop or distribute software that is functionally similar to the other party's products, so long as proprietary information of the other party is not included in such software.
+
+Third-Party Technology 
+The Oracle Technology may be distributed to You with third party technology or derivatives of third party technology (“Third Party Technology”).  Oracle may provide certain notices to You in Oracle Technology documentation, readmes or otherwise in connection with such Third Party Technology. 
+
+Third Party Technology will be licensed to You either under the terms of this agreement, or, if specified in the Oracle Technology documentation, readme files or otherwise, under separate license terms (“Separate Terms”) and not under the terms of this agreement (“Separately Licensed Third Party Technology”).   Your rights to use such Separately Licensed Third Party Technology under the Separate Terms are not restricted or modified in any way by this agreement.
+
+Entire Agreement
+You agree that this agreement is the complete agreement for the Oracle Technology and licenses, and, except as may be expressly set forth in Exhibit A, this agreement supersedes all prior or contemporaneous agreements or representations, including any clickwrap, shrinkwrap or similar licenses. If any term of this agreement is found to be invalid or unenforceable, the remaining provisions will remain effective.
+
+Last updated: 24 February 2015
+
+Should You have any questions concerning this License Agreement, or if You desire to contact Oracle for any reason, please write: 
+Oracle America, Inc. 
+500 Oracle Parkway, 
+Redwood City, CA 94065
+
+Oracle may contact You to ask if You had a satisfactory experience installing and using this software download and/or accessing and using the hosted environment.
diff --git a/src/jdk-devel/PKGBUILD b/src/jdk-devel/PKGBUILD
index c67fef5..8009f3a 100644
--- a/src/jdk-devel/PKGBUILD
+++ b/src/jdk-devel/PKGBUILD
@@ -1,20 +1,15 @@
 # Maintainer: Det <nimetonmaili g-mail>
-# Based on jre: https://aur.archlinux.org/packages/jdk/
 
 _pkgname=jdk
 pkgname=jdk-devel
-_major=9
-#_minor=1
-_build=181
-_pkgver=$_major
+_major=10
+_build=33
 pkgver=${_major}b${_build}
-#_pkgver=${_major}u${_minor}
-#pkgver=${_major}u${_minor}.b${_build}
 pkgrel=1
 pkgdesc="Oracle Java $_major Development Kit Snapshot"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://jdk.java.net/$_major/"
-license=('custom')
+license=('custom:Oracle')
 depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' 'nss' 'xdg-utils')
 optdepends=('alsa-lib: for basic sound support'
             'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse'
@@ -22,6 +17,7 @@ optdepends=('alsa-lib: for basic sound support'
 provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major"
           "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major"
           "java-openjfx=$_major")
+conflicts=("java-runtime-jre=$_major" "java-environment-jdk=$_major")
 
 # Variables
 _jname=${_pkgname}${_major}
@@ -38,26 +34,23 @@ backup=("etc/java-$_jname/management/jmxremote.access"
         "etc/java-$_jname/psfont.properties.ja"
         "etc/java-$_jname/psfontj2d.properties"
         "etc/java-$_jname/sound.properties")
-[[ $CARCH = i686 ]] && backup[0]="etc/java-$_jname/i386/jvm.cfg"
 options=('!strip') # JDK debug-symbols
 install=$pkgname.install
-source=("jconsole-$_jname.desktop"
+source=("http://download.java.net/java/jdk${_major}/archive/${_build}/binaries/${_pkgname}-${_major}-ea+${_build}_linux-x64_bin.tar.gz"
+        "jconsole-$_jname.desktop"
         "jmc-$_jname.desktop"
         "jvisualvm-$_jname.desktop"
         "policytool-$_jname.desktop"
-        'LICENSE-Early-Adopter-Terms.txt')
-source_i686=("http://download.java.net/java/jdk${_major}/archive/${_build}/binaries/${_pkgname}-${_pkgver}+${_build}_linux-x86_bin.tar.gz")
-source_x86_64=("http://download.java.net/java/jdk${_major}/archive/${_build}/binaries/${_pkgname}-${_pkgver}+${_build}_linux-x64_bin.tar.gz")
-sha256sums=('76a1e9a15e13bd62d953c1a4806be7821b2b09d974b6ed622b6d85c8d6dfc8b2'
-            '9e557bacfc3b78272c71ccef8d3d45a2772e0f942eba0e16bfe86f6f59f4a5ab'
-            'f5bf5f941a118d2db45a7e451e762e0f04ff38cea0f6674a09268daed09c4052'
-            'e9735a8bb202e64a9e9a949d202932e7e92587b4354f768cd29ba8f322dbd013'
-            'a8b0ecff3221f39c53092d910dfd903ff243a185835ad6d121abbbe82225d335')
-sha256sums_i686=('ba0c77644ece024cdb933571d79f0f035e91a9c9ab70de9c82446c9fbd000c97')
-sha256sums_x86_64=('2ef49c97ddcd5e0de20226eea4cca7b0d7de63ddec80eff8291513f6474ca0dc')
+        'LICENSE-Early-Adopter-Development-Agreement.txt')
+sha256sums=('b10905acca44c372533e57871e18a927a9f791bfce7a0223d2e7b38ed4c2d8aa'
+            '2e429abf6f14f506f8caa643eeed10921ef3c9b6820850778822f6e95a5fc956'
+            'c163f149154d8a3f76ba916d49215673f3056595d857b2f2b7074e88496bbd32'
+            'fd519f3ffb9ff649ae1c39674d247d9d26af2befb4ac557e885e84c3c4669950'
+            '2dfc037e6ffc5a2bba31afe44a6a0e1e6e4eb7bb105256793372a21083b1e3be'
+            '36d48f14c16f0dcc98a8ce2301fd2a111701e6f59a7da08b0e51fdb3e2f9ca89')
 
 package() {
-    cd ${_pkgname}-${_major}
+    cd $_pkgname-$_major
 
     msg2 "Creating directory structure..."
     install -d "$pkgdir"/etc/.java/.systemPrefs
@@ -82,11 +75,17 @@ package() {
     ln -s . jre
 
     msg2 "Fixing directory structure..."
-    # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png)
+    # Suffix .desktops + icon (sun-jcontrol.png -> sun-jcontrol-$_jname.png)
     for i in $(find lib/desktop/ -type f); do
         rename -- "." "-$_jname." $i
     done
 
+    # Link missing icons
+    for i in $(find lib/desktop/icons/ -name "sun-jcontrol-$_jname.png" -type f); do
+        ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/java}"
+        ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/javaws}"
+    done
+
     # Fix .desktop's
     sed -e '/JavaWS/!s|Name=Java|Name=Java '"$_major"'|' \
         -e "s|Name=JavaWS|Name=JavaWS $_major|" \
@@ -122,26 +121,16 @@ package() {
     done
 
     # Link NPAPI plugin
-    case "$CARCH" in
-        i686)   ln -sf $_jvmdir/lib/i386/libnpjp2.so  "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
-        x86_64) ln -sf $_jvmdir/lib/amd64/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
-    esac
+    ln -sf $_jvmdir/lib/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so
 
     # Replace JKS keystore with 'ca-certificates-java'
     ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts
 
     # Move/link licenses
     mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/
-    install -m644 "$srcdir"/LICENSE-Early-Adopter-Terms.txt "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/
+    install -m644 "$srcdir"/LICENSE-Early-Adopter-Development-Agreement.txt "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/
     ln -sf /usr/share/licenses/java$_major-$_pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
 
-    msg2 "Enabling Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy..."
-    # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for
-    # things like 256-bit AES. Enabled by default in OpenJDK:
-    # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html
-    # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html
-    sed -i "s/crypto.policy=limited/crypto.policy=unlimited/" "$pkgdir"/etc/java-$_jname/security/java.security
-
     msg2 "Enabling copy+paste in unsigned applets..."
     # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
     # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
diff --git a/src/jdk-devel/jconsole-jdk10.desktop b/src/jdk-devel/jconsole-jdk10.desktop
new file mode 100644
index 0000000..c2c9f59
--- /dev/null
+++ b/src/jdk-devel/jconsole-jdk10.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-10-jdk/bin/jconsole
+Icon=sun-java-jdk10
+Name=Java 10 Monitoring and Management Console
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Java;
diff --git a/src/jdk-devel/jdk-devel.install b/src/jdk-devel/jdk-devel.install
index aad611c..c1c188d 100644
--- a/src/jdk-devel/jdk-devel.install
+++ b/src/jdk-devel/jdk-devel.install
@@ -1,4 +1,4 @@
-THIS_JAVA='java-9-jdk'
+THIS_JAVA='java-10-jdk'
 NAME='JDK Devel'
 
 all_off="$(tput sgr0)"
@@ -10,6 +10,10 @@ note() {
     printf "${blue}::${yellow} archlinux-java:${bold} $1${all_off}\n"
 }
 
+note2() {
+    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
+}
+
 post_install() {
     default=$(archlinux-java get)
     case ${default} in
@@ -32,6 +36,14 @@ post_install() {
     if [[ ! -f /etc/ssl/certs/java/cacerts ]]; then
         update-ca-trust
     fi
+    
+    note2 "Since Oracle Java 9, some Qt 5 applications (such as the reader apps Zeal and
+          GoldenDict) will crash due to the existance of the Java NPAPI plugin symlink
+          (/usr/lib/mozilla/plugins/libnpjp2-jdk10.so).
+          
+          See: 
+          - https://github.com/zealdocs/zeal/issues/802
+          - https://bbs.archlinux.org/viewtopic.php?id=231222"
 }
 
 post_upgrade() {
diff --git a/src/jdk-devel/jmc-jdk10.desktop b/src/jdk-devel/jmc-jdk10.desktop
new file mode 100644
index 0000000..ba0c91e
--- /dev/null
+++ b/src/jdk-devel/jmc-jdk10.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-10-jdk/bin/jmc
+Icon=sun-java-jdk10
+Name=Java 10 Mission Control
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Java;
diff --git a/src/jdk-devel/jvisualvm-jdk10.desktop b/src/jdk-devel/jvisualvm-jdk10.desktop
new file mode 100644
index 0000000..bdd086d
--- /dev/null
+++ b/src/jdk-devel/jvisualvm-jdk10.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-10-jdk/bin/jvisualvm
+GenericName=Java 10 Monitoring and Performance Monitoring Tool
+Icon=sun-java-jdk10
+Name=Java 10 VisualVM
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Java;
diff --git a/src/jdk-devel/policytool-jdk10.desktop b/src/jdk-devel/policytool-jdk10.desktop
new file mode 100644
index 0000000..d1ba8ca
--- /dev/null
+++ b/src/jdk-devel/policytool-jdk10.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-10-jdk/bin/policytool
+Icon=sun-java-jdk10
+Name=Java 10 Policy Settings
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Settings;Java;
diff --git a/src/jdk/PKGBUILD b/src/jdk/PKGBUILD
index e85271e..f48e262 100644
--- a/src/jdk/PKGBUILD
+++ b/src/jdk/PKGBUILD
@@ -1,17 +1,14 @@
 # Maintainer: Det <nimetonmaili g-mail>
-# Based on jre: https://aur.archlinux.org/packages/jre/
 
 pkgname=jdk
-_major=8
-_minor=144
-_build=b01
-_hash=090f390dda5b47b9b721c7dfaa008135
-pkgver=${_major}u${_minor}
+pkgver=9.0.1
+_major=${pkgver/.*}
+_build=11
 pkgrel=1
 pkgdesc="Oracle Java Development Kit"
-arch=('i686' 'x86_64')
-url=http://www.oracle.com/technetwork/java/javase/downloads/index.html
-license=('custom')
+arch=('x86_64')
+url="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
+license=('custom:Oracle')
 depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' 'nss' 'xdg-utils')
 optdepends=('alsa-lib: for basic sound support'
             'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse'
@@ -19,49 +16,39 @@ optdepends=('alsa-lib: for basic sound support'
 provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major"
           "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major"
           "java-openjfx=$_major")
+conflicts=("java-runtime-jre=$_major" "java-environment-jdk=$_major")
 
 # Variables
 DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
 _jname=${pkgname}${_major}
 _jvmdir=/usr/lib/jvm/java-$_major-$pkgname
-
-backup=("etc/java-$_jname/amd64/jvm.cfg"
-        "etc/java-$_jname/images/cursors/cursors.properties"
-        "etc/java-$_jname/management/jmxremote.access"
+ 
+backup=("etc/java-$_jname/management/jmxremote.access"
         "etc/java-$_jname/management/management.properties"
         "etc/java-$_jname/security/java.policy"
         "etc/java-$_jname/security/java.security"
         "etc/java-$_jname/security/javaws.policy"
-        "etc/java-$_jname/content-types.properties"
-        "etc/java-$_jname/flavormap.properties"
         "etc/java-$_jname/fontconfig.properties.src"
         "etc/java-$_jname/logging.properties"
         "etc/java-$_jname/net.properties"
         "etc/java-$_jname/psfont.properties.ja"
         "etc/java-$_jname/psfontj2d.properties"
         "etc/java-$_jname/sound.properties")
-[[ $CARCH = i686 ]] && backup[0]="etc/java-$_jname/i386/jvm.cfg"
 options=('!strip') # JDK debug-symbols
 install=$pkgname.install
-source=("http://download.oracle.com/otn-pub/java/jce/$_major/jce_policy-$_major.zip"
+source=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${pkgname}-${pkgver}_linux-x64_bin.tar.gz"
         "jconsole-$_jname.desktop"
         "jmc-$_jname.desktop"
         "jvisualvm-$_jname.desktop"
         "policytool-$_jname.desktop")
-source_i686=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$pkgname-$pkgver-linux-i586.tar.gz")
-source_x86_64=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$pkgname-$pkgver-linux-x64.tar.gz")
-md5sums=('b3c7031bc65c28c2340302065e7d00d3'
-         'b4f0da18e03f7a9623cb073b65dde6c1'
-         '8f0ebcead2aecad67fbd12ef8ced1503'
-         'a4a21b064ff9f3c3f3fdb95edf5ac6f3'
-         '98245ddb13914a74f0cc5a028fffddca')
-md5sums_i686=('13d771707f326b02e2497c99e0a2ca37')
-md5sums_x86_64=('2d59a3add1f213cd249a67684d4aeb83')
-## Alternative mirror, if your local one is throttled:
-#source_x86_64=("http://ftp.wsisiz.edu.pl/pub/pc/pozyteczne%20oprogramowanie/java/$pkgname-$pkgver-linux-x64.gz")
+sha256sums=('2cdaf0ff92d0829b510edd883a4ac8322c02f2fc1beae95d048b6716076bc014'
+            '100fd0162a4be04371d9d53121bd511aeb0a230475497a8c19ed0cff20915efc'
+            'e4059de8ec0dee1a5eabd1d67a053509aa0009ba6e08739b11140c26f2fcc55a'
+            '1f74cc627bd6a934681fe2d453058c21794d1435205c501f7fecdaf2c94f5485'
+            'ff6684d7d5c26cc805e6f3918284a95b48223db4f37956f35a344373a2931aa4')
 
 package() {
-    cd ${pkgname}1.${_major}.0_${_minor}
+    cd $pkgname-$pkgver
 
     msg2 "Creating directory structure..."
     install -d "$pkgdir"/etc/.java/.systemPrefs
@@ -70,20 +57,11 @@ package() {
     install -d "$pkgdir"/usr/share/licenses/java$_major-$pkgname
 
     msg2 "Removing redundancies..."
-    rm    db/bin/*.bat
-    rm    db/3RDPARTY
-    rm    db/LICENSE
-    rm -r jre/lib/desktop/icons/HighContrast/
-    rm -r jre/lib/desktop/icons/HighContrastInverse/
-    rm -r jre/lib/desktop/icons/LowContrast/
-    rm    jre/lib/fontconfig.*.bfc
-    rm    jre/lib/fontconfig.*.properties.src
-    rm -r jre/plugin/
-    rm    jre/*.txt
-    rm    jre/COPYRIGHT
-    rm    jre/LICENSE
-    rm    jre/README
-    rm    man/ja
+    rm -r lib/desktop/icons/HighContrast
+    rm -r lib/desktop/icons/HighContrastInverse
+    rm -r lib/desktop/icons/LowContrast
+    rm    lib/fontconfig.*.bfc
+    rm    lib/fontconfig.*.properties.src
 
     msg2 "Moving contents..."
     mv * "$pkgdir"/$_jvmdir
@@ -91,66 +69,71 @@ package() {
     # Cd to the new playground
     cd "$pkgdir"/$_jvmdir
 
-    msg2 "Fixing directory structure..."
-    # Replace duplicate binaries in bin/ with links to jre/bin/
-    for i in $(ls jre/bin/); do
-        ln -sf "$_jvmdir/jre/bin/$i" "bin/$i"
-    done
+    # Create a placeholder 'jre' link
+    ln -s . jre
 
-    # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png)
-    for i in $(find jre/lib/desktop/ -type f); do
+    msg2 "Fixing directory structure..."
+    # Suffix .desktops + icon (sun-jcontrol.png -> sun-jcontrol-$_jname.png)
+    for i in $(find lib/desktop/ -type f); do
         rename -- "." "-$_jname." $i
     done
 
-    # Fix .desktop paths
-    sed -e "s|Exec=|Exec=$_jvmdir/jre/bin/|" \
+    # Link missing icons
+    for i in $(find lib/desktop/icons/ -name "sun-jcontrol-$_jname.png" -type f); do
+        ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/java}"
+        ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/javaws}"
+    done
+
+    # Fix .desktop's
+    sed -e '/JavaWS/!s|Name=Java|Name=Java '"$_major"'|' \
+        -e "s|Name=JavaWS|Name=JavaWS $_major|" \
+        -e "s|Comment=Java|Comment=Java $_major|" \
+        -e "s|Exec=|Exec=$_jvmdir/bin/|" \
         -e "s|.png|-$_jname.png|" \
-    -i jre/lib/desktop/applications/*
+    -i lib/desktop/applications/*
 
     # Move .desktops + icons to /usr/share
-    mv jre/lib/desktop/* "$pkgdir"/usr/share/
+    mv lib/desktop/* "$pkgdir"/usr/share/
     install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
 
-    # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/jre/lib -> /etc
+    # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/conf -> /etc
+    for old_usr_path in $(find conf/ -type f); do
+        # New location
+        new_etc_path="/etc/java-$_jname/${old_usr_path/conf\/}"
+
+        # Move /link
+        install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
+        ln -sf "$new_etc_path" "$old_usr_path"
+    done
+
+    # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/lib -> /etc
     for new_etc_path in ${backup[@]}; do
         # Old location
-        old_usr_path="jre/lib/${new_etc_path#*$_jname/}"
+        old_usr_path="lib/${new_etc_path#*$_jname/}"
 
-        # Move
-        install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
-        ln -sf "/$new_etc_path" "$old_usr_path"
+        # Move/link
+        if [[ -f $old_usr_path ]]; then
+            install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
+            ln -sf "/$new_etc_path" "$old_usr_path"
+        fi
     done
 
     # Link NPAPI plugin
-    case "$CARCH" in
-        i686)   ln -sf $_jvmdir/jre/lib/i386/libnpjp2.so  "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
-        x86_64) ln -sf $_jvmdir/jre/lib/amd64/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
-    esac
+    ln -sf $_jvmdir/lib/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so
 
     # Replace JKS keystore with 'ca-certificates-java'
-    ln -sf /etc/ssl/certs/java/cacerts jre/lib/security/cacerts
-
-    # Suffix man pages
-    for i in $(find man/ -type f); do
-        mv "$i" "${i/.1}-$_jname.1"
-    done
-
-    # Move man pages
-    mv man/ja_JP.UTF-8/ man/ja
-    mv man/ "$pkgdir"/usr/share
+    ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts
 
     # Move/link licenses
-    mv db/NOTICE COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java$_major-$pkgname/
+    mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$pkgname/
     ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
 
-    msg2 "Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files..."
-    # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for
-    # things like 256-bit AES. Enabled by default in OpenJDK:
-    # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html
-    # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html
-    install -m644 "$srcdir"/UnlimitedJCEPolicyJDK$_major/*.jar jre/lib/security/
-    install -Dm644 "$srcdir"/UnlimitedJCEPolicyJDK$_major/README.txt \
-                   "$pkgdir"/usr/share/doc/$pkgname/README_-_Java_JCE_Unlimited_Strength.txt
+    # msg2 "Enabling Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy..."
+    # # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for
+    # # things like 256-bit AES. Enabled by default in OpenJDK:
+    # # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html
+    # # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html
+    # sed -i "s/crypto.policy=limited/crypto.policy=unlimited/" "$pkgdir"/etc/java-$_jname/security/java.security
 
     msg2 "Enabling copy+paste in unsigned applets..."
     # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
diff --git a/src/jdk/jconsole-jdk9.desktop b/src/jdk/jconsole-jdk9.desktop
new file mode 100644
index 0000000..8df3672
--- /dev/null
+++ b/src/jdk/jconsole-jdk9.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-9-jdk/bin/jconsole
+Icon=sun-java-jdk9
+Name=Java Monitoring and Management Console
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Java;
diff --git a/src/jdk/jdk.install b/src/jdk/jdk.install
index fa8e3bb..faaf439 100644
--- a/src/jdk/jdk.install
+++ b/src/jdk/jdk.install
@@ -1,4 +1,4 @@
-THIS_JAVA='java-8-jdk'
+THIS_JAVA='java-9-jdk'
 NAME='JDK'
 
 all_off="$(tput sgr0)"
@@ -10,6 +10,10 @@ note() {
     printf "${blue}::${yellow} archlinux-java:${bold} $1${all_off}\n"
 }
 
+note2() {
+    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
+}
+
 post_install() {
     default=$(archlinux-java get)
     case ${default} in
@@ -32,6 +36,14 @@ post_install() {
     if [[ ! -f /etc/ssl/certs/java/cacerts ]]; then
         update-ca-trust
     fi
+
+    note2 "Since Oracle Java 9, some Qt 5 applications (such as the reader apps Zeal and
+          GoldenDict) will crash due to the existance of the Java NPAPI plugin symlink
+          (/usr/lib/mozilla/plugins/libnpjp2-jdk9.so).
+          
+          See: 
+          - https://github.com/zealdocs/zeal/issues/802
+          - https://bbs.archlinux.org/viewtopic.php?id=231222"
 }
 
 post_upgrade() {
diff --git a/src/jdk/jmc-jdk9.desktop b/src/jdk/jmc-jdk9.desktop
new file mode 100644
index 0000000..ceb74b0
--- /dev/null
+++ b/src/jdk/jmc-jdk9.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-9-jdk/bin/jmc
+Icon=sun-java-jdk9
+Name=Java Mission Control
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Java;
diff --git a/src/jdk/jvisualvm-jdk9.desktop b/src/jdk/jvisualvm-jdk9.desktop
new file mode 100644
index 0000000..745ab80
--- /dev/null
+++ b/src/jdk/jvisualvm-jdk9.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-9-jdk/bin/jvisualvm
+GenericName=Java Monitoring and Performance Monitoring Tool
+Icon=sun-java-jdk9
+Name=Java VisualVM
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Java;
diff --git a/src/jdk/policytool-jdk9.desktop b/src/jdk/policytool-jdk9.desktop
new file mode 100644
index 0000000..61e57cf
--- /dev/null
+++ b/src/jdk/policytool-jdk9.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-9-jdk/bin/policytool
+Icon=sun-java-jdk9
+Name=Java Policy Settings
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Settings;Java;
diff --git a/src/lgogdownloader/PKGBUILD b/src/lgogdownloader/PKGBUILD
index 3828419..f936b1a 100755
--- a/src/lgogdownloader/PKGBUILD
+++ b/src/lgogdownloader/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Joe Davison <joe@warhaggis.com>
 
 pkgname=lgogdownloader
-pkgver=3.2
+pkgver=3.3
 pkgrel=1
 pkgdesc="An open source downloader for GOG.com games, uses the GOG.com API"
 url="https://sites.google.com/site/gogdownloader/"
@@ -10,7 +10,7 @@ license=(WTFPL)
 depends=('boost' 'jsoncpp' 'liboauth' 'rhash' 'tinyxml2' 'htmlcxx' 'curl')
 makedepends=('help2man' 'cmake')
 source=("http://sites.google.com/site/gogdownloader/$pkgname-$pkgver.tar.gz")
-sha256sums=('9e60af50c18533884ca317778b291152d5f04d93dfd3dc2579f6f965538b2031')
+sha256sums=('8bb7a37b48f558bddeb662ebac32796b0ae11fa2cc57a03d48b3944198e800ce')
 
 prepare() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/src/lib32-ncurses5-compat-libs/PKGBUILD b/src/lib32-ncurses5-compat-libs/PKGBUILD
index 3f7f01f..1c72921 100644
--- a/src/lib32-ncurses5-compat-libs/PKGBUILD
+++ b/src/lib32-ncurses5-compat-libs/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgbasename=ncurses
 pkgname=lib32-${_pkgbasename}5-compat-libs
-_pkgver=6.0
+_pkgver=6.0-20170902
 pkgver=${_pkgver/-/+}
 pkgrel=1
 pkgdesc="System V Release 4.0 curses emulation library (32-bit), ABI 5"
@@ -11,8 +11,8 @@ url='http://invisible-island.net/ncurses/ncurses.html'
 license=('MIT')
 depends=('lib32-glibc' "lib32-${_pkgbasename}")
 makedepends=("gcc-multilib")
-source=(ftp://ftp.invisible-island.net/ncurses/ncurses-${_pkgver}.tar.gz{,.asc})
-md5sums=('ee13d052e1ead260d7c28071f46eefb1'
+source=(http://invisible-mirror.net/archives/ncurses/current/ncurses-${_pkgver}.tgz{,.asc})
+md5sums=('b7b1cedc484172434855b00831183458'
          'SKIP')
 validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # Thomas Dickey
 
diff --git a/src/libgcj17-bin/PKGBUILD b/src/libgcj17-bin/PKGBUILD
index 97fe251..f48d522 100755
--- a/src/libgcj17-bin/PKGBUILD
+++ b/src/libgcj17-bin/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Roberto Calabrese <robertocalabrese75 [at] gmail.com>
 
 pkgname=libgcj17-bin
-pkgver=6.4.0_3
+pkgver=6.4.0_10
 pkgrel=1
 pkgdesc="Dynamically load and interpret java class files. Built from binary \
 executables available in Debian repositories."
@@ -16,8 +16,8 @@ depends=(zlib)
 
 source_i686=(http://ftp.debian.org/debian/pool/main/g/gcc-6/${pkgname%-*}_${pkgver%_*}-${pkgver##*_}_i386.deb)
 source_x86_64=(http://ftp.debian.org/debian/pool/main/g/gcc-6/${pkgname%-*}_${pkgver%_*}-${pkgver##*_}_amd64.deb)
-sha1sums_i686=('f848a489575d66e0be294b5df6303939f3d9d6b5')
-sha1sums_x86_64=('7b4be43b474f6f960e3fa0c336b976ecbfba2f15')
+sha1sums_i686=('214d53fc289dcaf55c8833f741a7f0838bbf3879')
+sha1sums_x86_64=('926132e3811d98cb5b47e601f6ddb2a91e20becf')
 
 prepare() {
   tar xf data.tar.*
diff --git a/src/libretro-atari800-git/PKGBUILD b/src/libretro-atari800-git/PKGBUILD
index d2f6be3..76040b5 100644
--- a/src/libretro-atari800-git/PKGBUILD
+++ b/src/libretro-atari800-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=libretro-atari800-git
-pkgver=41.47e8064
+pkgver=66.f892b44
 pkgrel=1
 pkgdesc="libretro implementation of Atari800 v3.1.0 (Atari 5200/400/800/XL/XE) (WIP)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
@@ -18,7 +18,7 @@ source=("git+https://github.com/libretro/${_gitname}.git"
 	"cfg.patch"
 	"joycfg.patch")
 sha256sums=('SKIP'
-	'f482663fa58468d889e615909ba9e09d2e616300a9575338b86ce1b93d751bdb'
+	'2ff0e3a58e19b9532d92d1d93e55890a2de42475c144d8d4e58480a986c18ede'
 	'41e0c608d07cdc3228d37a7a29fd40b6629e964c13d14ba413fa84e956ef3777'
 	'd30794556b622c757dbafb5ce988547967004bd2d779c74e28802f9dd78a167f')
 
diff --git a/src/libretro-atari800-git/atari800_libretro.info b/src/libretro-atari800-git/atari800_libretro.info
index 15fc5d7..c5de134 100644
--- a/src/libretro-atari800-git/atari800_libretro.info
+++ b/src/libretro-atari800-git/atari800_libretro.info
@@ -1,18 +1,22 @@
 display_name = "Atari 5200/400/800/XL/XE (Atari800)"
 authors = "Petr Stehlik"
-supported_extensions = "xfd|atr|cdm|cas|bin|a52|zip"
+supported_extensions = "xfd|atr|atx|cdm|cas|bin|a52|xex|zip"
 corename = "Atari800"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Atari 5200/400/800/XL/XE"
-license = "GPLv2"
+license = "GPL"
 permissions = ""
 display_version = "3.1.0"
 supports_no_game = "false"
-firmware_count = 2
-firmware0_desc = "ATARIOSB.ROM (Atari OS-B image file)"
+firmware_count = 3
+firmware0_desc = "ATARIOSB.ROM (Atari OS-B BIOS)"
 firmware0_path = "ATARIOSB.ROM"
 firmware0_opt = "false"
-firmware1_desc = "ATARIXL.ROM (Atari-XL image file)"
+firmware1_desc = "ATARIXL.ROM (Atari-XL BIOS)"
 firmware1_path = "ATARIXL.ROM"
 firmware1_opt = "false"
+firmware2_desc = "5200.rom (5200 BIOS)"
+firmware2_path = "5200.rom"
+firmware2_opt = "false"
+notes = "(!) 5200.rom (md5): 281f20ea4320404ec820fb7ec0693b38"
diff --git a/src/libretro-handy-git/PKGBUILD b/src/libretro-handy-git/PKGBUILD
index 2636dc8..13ab570 100644
--- a/src/libretro-handy-git/PKGBUILD
+++ b/src/libretro-handy-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=libretro-handy-git
-pkgver=99.420a16f
+pkgver=107.a4de67f
 pkgrel=1
 pkgdesc="libretro implementation of Handy. (Atari Lynx)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
diff --git a/src/libretro-hatari-git/PKGBUILD b/src/libretro-hatari-git/PKGBUILD
index aed3d3f..5f53f8a 100644
--- a/src/libretro-hatari-git/PKGBUILD
+++ b/src/libretro-hatari-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=libretro-hatari-git
-pkgver=5433.62bc27fd
+pkgver=5436.c19b7105
 pkgrel=1
 pkgdesc="libretro implementation of Hatari v1.8 (Atari ST/STE/TT/Falcon)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
diff --git a/src/libretro-prosystem-git/PKGBUILD b/src/libretro-prosystem-git/PKGBUILD
index 0dd9179..73d14ae 100644
--- a/src/libretro-prosystem-git/PKGBUILD
+++ b/src/libretro-prosystem-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=libretro-prosystem-git
-pkgver=133.018c722
+pkgver=148.b41e9ba
 pkgrel=1
 pkgdesc="libretro implementation of ProSystem. (Atari 7800)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
diff --git a/src/libretro-snes9x2010-git/PKGBUILD b/src/libretro-snes9x2010-git/PKGBUILD
index b303121..1a55a85 100644
--- a/src/libretro-snes9x2010-git/PKGBUILD
+++ b/src/libretro-snes9x2010-git/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: almostalive   <almostalive2003 at gmail dot com>
 
 pkgname=libretro-snes9x2010-git
-pkgver=851.b2a69de
+pkgver=878.887d41d
 pkgrel=1
 pkgdesc="libretro implementation of Snes9x Next. (Super Nintendo Entertainment System)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
@@ -16,7 +16,7 @@ _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')
+         'SKIP')
 
 pkgver() {
   cd "${_gitname}"
diff --git a/src/libretro-stella-git/PKGBUILD b/src/libretro-stella-git/PKGBUILD
index 4807a0f..611d2fd 100644
--- a/src/libretro-stella-git/PKGBUILD
+++ b/src/libretro-stella-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=libretro-stella-git
-pkgver=182.abcd658
+pkgver=193.dfe86f9
 pkgrel=1
 pkgdesc="libretro implementation of Stella. (Atari 2600)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
diff --git a/src/libretro-vba-next-git/PKGBUILD b/src/libretro-vba-next-git/PKGBUILD
index 3391cb7..83fefef 100644
--- a/src/libretro-vba-next-git/PKGBUILD
+++ b/src/libretro-vba-next-git/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: almostalive   <almostalive2003 at gmail dot com>
 
 pkgname=libretro-vba-next-git
-pkgver=688.41f6e9a
+pkgver=681.e773475
 pkgrel=1
 pkgdesc="libretro implementation of VBA Next. (Game Boy Advance)"
 groups=('libretro')
diff --git a/src/libretro-virtualjaguar-git/PKGBUILD b/src/libretro-virtualjaguar-git/PKGBUILD
index 66619a9..0c7c89d 100644
--- a/src/libretro-virtualjaguar-git/PKGBUILD
+++ b/src/libretro-virtualjaguar-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=libretro-virtualjaguar-git
-pkgver=206.cd9a3b0
+pkgver=209.f073823
 pkgrel=1
 pkgdesc="libretro implementation of Virtual Jaguar. (Atari Jaguar)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
diff --git a/src/memtest86-efi/PKGBUILD b/src/memtest86-efi/PKGBUILD
index 050dbbe..47ef58d 100644
--- a/src/memtest86-efi/PKGBUILD
+++ b/src/memtest86-efi/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgbasename=memtest86
 pkgname=$_pkgbasename-efi
 pkgver=7.4
-pkgrel=1
+pkgrel=3
 pkgdesc="A free, thorough, stand alone memory test as an EFI application"
 arch=('i686' 'x86_64')
 url="http://www.memtest86.com"
@@ -21,7 +21,7 @@ source=("$_pkgbasename-$pkgver.iso.tar.gz::http://www.memtest86.com/downloads/$_
 	"memtest86-efi-update.hook"
 	"memtest86-efi-remove.hook")
 md5sums=('1719171a1d84d6b183112568cbdf8d61'
-         '5dc6005ffd904163c40ceb06e68a467b'
+         '9d970ce33ec9633fc823916faf614b61'
          '6c096df3f55baf3e27c3bd605a418aa2'
          '8b4aa0e2f5d769d902459c8f8d514336'
          '496120c33c2af986933bf33456fa6cf3'
diff --git a/src/memtest86-efi/memtest86-efi b/src/memtest86-efi/memtest86-efi
index cb79078..7889ce3 100644
--- a/src/memtest86-efi/memtest86-efi
+++ b/src/memtest86-efi/memtest86-efi
@@ -51,6 +51,8 @@ install() {
 	echo -en "else enter device path manually (like ${CB}/dev/sdXY${CR}): "
 	read choice
 	[[ -n $choice ]] && partition=$choice
+	partnumber=$(echo $partition | grep -Eo '[0-9]+$')
+	[[ $partition == "/dev/nvme"* ]] && device=$(echo $partition | cut -dp -f1) || device=${partition//$partnumber}
 
 	# Find ESP mount point
 	esp=$(mount | grep $partition | awk '{print $3}' | tail -n1)
@@ -95,7 +97,7 @@ install() {
 			checkcommand efibootmgr
 			_common_install
 			echo -e "\nAdd a new EFI boot entry..."
-			efibootmgr -c -d ${partition:0:8} -p ${partition:8} -w -L "MemTest86" -l "\EFI\memtest86\memtest$ARCH.efi" # Manage efi entry
+			efibootmgr -c -d ${device} -p ${partnumber} -w -L "MemTest86" -l "\EFI\memtest86\memtest$ARCH.efi" # Manage efi entry
 		;;
 
 		3) # Install MemTest86 in $esp/EFI/memtest86/ & add a file for GRUB2
diff --git a/src/ncurses5-compat-libs/PKGBUILD b/src/ncurses5-compat-libs/PKGBUILD
index 8741e43..30af534 100644
--- a/src/ncurses5-compat-libs/PKGBUILD
+++ b/src/ncurses5-compat-libs/PKGBUILD
@@ -4,18 +4,18 @@
 
 pkgname=ncurses5-compat-libs
 _pkgname=ncurses
-_pkgver=6.0-20170527
+_pkgver=6.0-20170902
 pkgver=${_pkgver/-/+}
 pkgrel=1
 pkgdesc='System V Release 4.0 curses emulation library, ABI 5'
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url='http://invisible-island.net/ncurses/ncurses.html'
-license=('MIT')
-depends=('glibc' 'gcc-libs' 'sh')
-provides=('libtinfo5')
-conflicts=('libtinfo5')
+license=(MIT)
+depends=(glibc gcc-libs sh)
+provides=(libtinfo5)
+conflicts=(libtinfo5)
 source=(http://invisible-mirror.net/archives/ncurses/current/ncurses-${_pkgver}.tgz{,.asc})
-md5sums=('c0e32e50ed6fd81af7ecc4910de9fa3f'
+md5sums=('b7b1cedc484172434855b00831183458'
          'SKIP')
 validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB')  # Thomas Dickey
 
@@ -31,7 +31,7 @@ build() {
 package() {
   cd ${_pkgname}-${_pkgver}
   make DESTDIR="$pkgdir" install.libs
-  rm -rf "$pkgdir"/usr/include/ "$pkgdir"/usr/lib/pkgconfig \
+  rm -rf "$pkgdir/usr/include/" "$pkgdir/usr/lib/pkgconfig" \
     "$pkgdir"/usr/lib/*.so
 
   # fool packages looking to link to non-wide-character ncurses libraries
diff --git a/src/ocserv/PKGBUILD b/src/ocserv/PKGBUILD
index 936e8db..8633f75 100644
--- a/src/ocserv/PKGBUILD
+++ b/src/ocserv/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 pkgname=ocserv
-pkgver=0.11.8
+pkgver=0.11.9
 pkgrel=1
 pkgdesc="OpenConnect VPN Server"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ depends=('autogen' 'libpcl' 'http-parser' 'libnl' 'libsystemd' 'protobuf-c' 'tal
 makedepends=('freeradius' 'gperf' 'tcp-wrappers')
 backup=('etc/ocserv.config' 'etc/ocserv-passwd')
 source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/ocserv/ocserv/repository/archive.tar.gz?ref=ocserv_${pkgver//./_}")
-sha256sums=('5bea5ac25e076bccc9f94d09159e60a5db80afc24a3e81b4b9f07221e1c38f57')
+sha256sums=('4f44d5351a8b329386693ba68527331d2f944f67c218dfce591e1eb2d1c2be7e')
 
 prepare() {
   cd ${pkgname}-${pkgname}_*
diff --git a/src/perl-file-libmagic/PKGBUILD b/src/perl-file-libmagic/PKGBUILD
index a4cd3e8..e99eef6 100644
--- a/src/perl-file-libmagic/PKGBUILD
+++ b/src/perl-file-libmagic/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=perl-file-libmagic
 pkgver=1.15
-pkgrel=4
+pkgrel=5
 pkgdesc="Determine MIME types of data or files using libmagic"
 arch=('any')
 url="http://search.cpan.org/~drolsky/File-LibMagic"
diff --git a/src/prosody-hg-stable/PKGBUILD b/src/prosody-hg-stable/PKGBUILD
index 325fc22..a75ebb8 100644
--- a/src/prosody-hg-stable/PKGBUILD
+++ b/src/prosody-hg-stable/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=prosody-hg-stable
 pkgrel=1
-pkgver=0.10.r7402+.d43012448c1f+
+pkgver=0.10.r7496+.7ea3311ca632+
 pkgver() {
   cd "$srcdir/prosody-hg"
   printf "0.10.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
diff --git a/src/python2-sabyenc/PKGBUILD b/src/python2-sabyenc/PKGBUILD
deleted file mode 100644
index c8941d6..0000000
--- a/src/python2-sabyenc/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Ben Ruijl <benruyl@gmail.com>
-
-pkgname=python2-sabyenc
-pkgver=3.0.2
-pkgrel=3
-pkgdesc="Python2 yEnc package optimized for use within SABnzbd"
-url="https://github.com/sabnzbd/sabyenc"
-arch=('i686' 'x86_64' 'armv7h')
-license=("GPL")
-depends=("python2")
-makedepends=("python2-setuptools")
-
-source=("https://github.com/sabnzbd/sabyenc/archive/v${pkgver}.tar.gz")
-md5sums=('49684574e411ee36cc96e8b70aa99ad9')
-
-build() {
-  cd "${srcdir}/sabyenc-${pkgver}"
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/sabyenc-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-}
diff --git a/src/qemu-user-static/PKGBUILD b/src/qemu-user-static/PKGBUILD
index 691c088..34209ec 100644
--- a/src/qemu-user-static/PKGBUILD
+++ b/src/qemu-user-static/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Steven Noonan <steven@uplinklabs.net>
 
 pkgname=qemu-user-static
-pkgver=2.8
-pkgrel=8
+pkgver=2.10
+pkgrel=2
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation, statically linked."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@@ -13,10 +13,10 @@ optdepends=('binfmt-support: to allow handling foreign ELF binaries and executin
 conflicts=()
 _arch=i386
 [ "$CARCH" = 'x86_64' ] && _arch=amd64
-_debsrc=${pkgname}_${pkgver}+dfsg-7_${_arch}.deb
+_debsrc=${pkgname}_${pkgver}.0+dfsg-2_${_arch}.deb
 source=(http://ftp.debian.org/debian/pool/main/q/qemu/${_debsrc})
-sha1sums=('5688c6b2bf8fd6f04d7f20ca524782b636e85a85')
-[ "$CARCH" = 'i686' ] && sha1sums=('18b2ec72a270195cd5c984f2dd4da3d3e01a5a95')
+sha1sums=('54769805a14accc6f2eb40a26fb6f984d817052a')
+[ "$CARCH" = 'i686' ] && sha1sums=('5924eb7caa3ddb2585d0a8308e69cbe922b18db6')
 
 prepare() {
   cd "$srcdir"
diff --git a/src/redis-desktop-manager/PKGBUILD b/src/redis-desktop-manager/PKGBUILD
index 0bb8203..761b496 100644
--- a/src/redis-desktop-manager/PKGBUILD
+++ b/src/redis-desktop-manager/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Vyacheslav Konovalov <echo dnlhY2hrb25vdmFsb3ZAZ21haWwuY29tCg== | base64 -d>
 
 pkgname=redis-desktop-manager
-_pkgver=0.9.0-alpha4
+_pkgver=0.9.0-alpha5
 pkgver=${_pkgver/-/_}
 pkgrel=1
 pkgdesc='Open source cross-platform Redis Desktop Manager based on Qt 5'
@@ -9,12 +9,14 @@ arch=('x86_64')
 url="https://redisdesktop.com/"
 license=('GPLv3')
 depends=('qt5-base' 'qt5-charts' 'qt5-imageformats' 'qt5-tools' 'qt5-declarative' 'qt5-quickcontrols' 'qt5-graphicaleffects' 'qt5-svg' 'libssh2')
-makedepends=('git' 'gcc' 'python2')
+makedepends=('git' 'gcc')
 conflicts=('redis-desktop-manager-bin')
 source=("rdm::git://github.com/uglide/RedisDesktopManager.git#tag=${_pkgver}"
+        'fix.patch'
         'rdm.sh'
         'rdm.desktop')
 sha256sums=('SKIP'
+            'a093ac27fb246422ff304e14a35c2b4c3869f1f6e3c6d0fdcbdaf37d867973cd'
             'f469d9a5adce723904efe0f1b1db5d79807410f90aafb117f18ae108d8b2d391'
             '4fac85cec4a7abe7254ff3a6f0382d9a6f2b712372ecbd74474a2f8efe9c4e3c')
 
@@ -22,6 +24,7 @@ prepare() {
   cd rdm/
   git submodule update --init --recursive
   git submodule add https://chromium.googlesource.com/linux-syscall-support 3rdparty/linux-syscall-support
+  git apply $srcdir/fix.patch
 
   python2 build/utils/set_version.py "${_pkgver}" > src/version.h
   python2 build/utils/set_version.py "${_pkgver}" > 3rdparty/crashreporter/src/version.h
diff --git a/src/redis-desktop-manager/fix.patch b/src/redis-desktop-manager/fix.patch
new file mode 100644
index 0000000..a12e0d6
--- /dev/null
+++ b/src/redis-desktop-manager/fix.patch
@@ -0,0 +1,213 @@
+diff --git a/3rdparty/gbreakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/3rdparty/gbreakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+index c80724d..93b4d9f 100644
+--- a/3rdparty/gbreakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/3rdparty/gbreakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -40,15 +40,15 @@ namespace google_breakpad {
+ 
+ #if defined(__i386__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_ESP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_EIP];
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                                     const struct _libc_fpstate* fp) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 
+@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ 
+ #elif defined(__x86_64)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RSP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RIP];
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                                     const struct _libc_fpstate* fpregs) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 
+@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ 
+ #elif defined(__ARM_EABI__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.arm_sp;
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.arm_pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+   out->context_flags = MD_CONTEXT_ARM_FULL;
+ 
+   out->iregs[0] = uc->uc_mcontext.arm_r0;
+@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
+ 
+ #elif defined(__aarch64__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.sp;
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                                     const struct fpsimd_context* fpregs) {
+   out->context_flags = MD_CONTEXT_ARM64_FULL;
+ 
+@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ 
+ #elif defined(__mips__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+ #if _MIPS_SIM == _ABI64
+   out->context_flags = MD_CONTEXT_MIPS64_FULL;
+ #elif _MIPS_SIM == _ABIO32
+diff --git a/3rdparty/gbreakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/3rdparty/gbreakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+index b6e77b4..2369a9a 100644
+--- a/3rdparty/gbreakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/3rdparty/gbreakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -41,21 +41,21 @@ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext structs.
+ struct UContextReader {
+-  static uintptr_t GetStackPointer(const struct ucontext* uc);
++  static uintptr_t GetStackPointer(const ucontext_t* uc);
+ 
+-  static uintptr_t GetInstructionPointer(const struct ucontext* uc);
++  static uintptr_t GetInstructionPointer(const ucontext_t* uc);
+ 
+   // Juggle a arch-specific ucontext into a minidump format
+   //   out: the minidump structure
+   //   info: the collection of register structures.
+ #if defined(__i386__) || defined(__x86_64)
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                              const struct _libc_fpstate* fp);
+ #elif defined(__aarch64__)
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                              const struct fpsimd_context* fpregs);
+ #else
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
+ #endif
+ };
+ 
+diff --git a/3rdparty/gbreakpad/src/client/linux/handler/exception_handler.cc b/3rdparty/gbreakpad/src/client/linux/handler/exception_handler.cc
+index d372a10..14b18be 100644
+--- a/3rdparty/gbreakpad/src/client/linux/handler/exception_handler.cc
++++ b/3rdparty/gbreakpad/src/client/linux/handler/exception_handler.cc
+@@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
+   // Fill in all the holes in the struct to make Valgrind happy.
+   memset(&g_crash_context_, 0, sizeof(g_crash_context_));
+   memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
+-  memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
++  memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
+ #if defined(__aarch64__)
+-  struct ucontext* uc_ptr = (struct ucontext*)uc;
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
+   struct fpsimd_context* fp_ptr =
+       (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
+   if (fp_ptr->head.magic == FPSIMD_MAGIC) {
+@@ -450,9 +450,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
+   }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of struct ucontext
++  // In case of MIPS Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+-  struct ucontext* uc_ptr = (struct ucontext*)uc;
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+     memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
+            sizeof(g_crash_context_.float_state));
+@@ -471,12 +471,13 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
+ // This is a public interface to HandleSignal that allows the client to
+ // generate a crash dump. This function may run in a compromised context.
+ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
+-  siginfo_t siginfo = {};
++  siginfo_t siginfo;
++  memset(&siginfo, 0, sizeof(siginfo_t));
+   // Mimic a trusted signal to allow tracing the process (see
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  struct ucontext context;
++  ucontext_t context;
+   getcontext(&context);
+   return HandleSignal(sig, &siginfo, &context);
+ }
+diff --git a/3rdparty/gbreakpad/src/client/linux/handler/exception_handler.h b/3rdparty/gbreakpad/src/client/linux/handler/exception_handler.h
+index 591c310..846df77 100644
+--- a/3rdparty/gbreakpad/src/client/linux/handler/exception_handler.h
++++ b/3rdparty/gbreakpad/src/client/linux/handler/exception_handler.h
+@@ -191,7 +191,7 @@ class ExceptionHandler {
+   struct CrashContext {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+-    struct ucontext context;
++    ucontext_t context;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of struct
+diff --git a/3rdparty/gbreakpad/src/client/linux/microdump_writer/microdump_writer.cc b/3rdparty/gbreakpad/src/client/linux/microdump_writer/microdump_writer.cc
+index 3764eec..80ad5c4 100644
+--- a/3rdparty/gbreakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/3rdparty/gbreakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -593,7 +593,7 @@ class MicrodumpWriter {
+ 
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+-  const struct ucontext* const ucontext_;
++  const ucontext_t* const ucontext_;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+diff --git a/3rdparty/gbreakpad/src/client/linux/minidump_writer/minidump_writer.cc b/3rdparty/gbreakpad/src/client/linux/minidump_writer/minidump_writer.cc
+index d11ba6e..c716143 100644
+--- a/3rdparty/gbreakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/3rdparty/gbreakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -1323,7 +1323,7 @@ class MinidumpWriter {
+   const int fd_;  // File descriptor where the minidum should be written.
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+-  const struct ucontext* const ucontext_;  // also from the signal handler
++  const ucontext_t* const ucontext_;  // also from the signal handler
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
diff --git a/src/scallion/PKGBUILD b/src/scallion/PKGBUILD
index a83cca2..42252dc 100644
--- a/src/scallion/PKGBUILD
+++ b/src/scallion/PKGBUILD
@@ -1,49 +1,40 @@
-# Maintainer: Dylan <dylan@hashflo.net>
+# Maintainer: Dylan <dylan@psilly.com>
 
 pkgname=scallion
-pkgver=2.0
+pkgver=2.1
 pkgrel=1
-pkgdesc="Creates vanity GPG keys and .onion addresses (for Tor's hidden services) using OpenCL."
-arch=('i686' 'x86_64')
+pkgdesc="Creates vanity GPG keys and .onion addresses using OpenCL."
+arch=("i686" "x86_64")
 url="https://github.com/lachesis/scallion"
 license=('MIT')
-makedepends=('git' 'mono')
-depends=('mono')
+makedepends=('mono')
+depends=('mono' 'openssl-1.0')
 optdepends=(
-  'opencl-nvidia: OpenCL support for NVIDIA'
-  'opencl-mesa: OpenCL support for AMD/ATI Radeon mesa'
+  "opencl-nvidia: For NVIDIA"
+  "opencl-mesa: For AMD/ATI Radeon mesa"
+)
+source=(
+    "$url/archive/v$pkgver.tar.gz"
+    "scallion.sh"
+    "set_openssl_1.0_paths.patch"
+)
+sha256sums=(
+    "0b1a8daec7873546d89b1174af2e475963af86de3016ed63b28302bf5bb80c1c"
+    "1090325b7cd46c5b90ac0c9c841ca6ccf15141fd3c7b2f409ebecf0db1d39dff"
+    "28a1a2429bef1e150316176a07c5dfc7f5c2052e152c94ed22dd563b86408546"
 )
-source=('scallion.sh')
-sha256sums=('1090325b7cd46c5b90ac0c9c841ca6ccf15141fd3c7b2f409ebecf0db1d39dff')
-
-_gitroot="git://github.com/lachesis/scallion.git"
-_gitname=scallion
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "$_gitroot" "$_gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
+  pushd "$srcdir/$pkgname-$pkgver"
   xbuild scallion.sln
+  popd
+  patch "$srcdir/$pkgname-$pkgver/$pkgname/bin/Debug/openssl.dll.config" "set_openssl_1.0_paths.patch"
 }
 
 package() {
   install -Dm755 scallion.sh "$pkgdir/usr/bin/$pkgname"
   install -d "$pkgdir/usr/share"
-  cp -r "$srcdir/$_gitname-build/$pkgname/bin/Debug" "$pkgdir/usr/share/$pkgname"
+  cp -r "$srcdir/$pkgname-$pkgver/$pkgname/bin/Debug" "$pkgdir/usr/share/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/src/scallion/scallion.sh b/src/scallion/scallion.sh
old mode 100755
new mode 100644
diff --git a/src/scallion/set_openssl_1.0_paths.patch b/src/scallion/set_openssl_1.0_paths.patch
new file mode 100644
index 0000000..7e3b11e
--- /dev/null
+++ b/src/scallion/set_openssl_1.0_paths.patch
@@ -0,0 +1,6 @@
+4,5c4,5
+< 	<dllmap os="!windows,osx" dll="libeay32" target="libcrypto.so"/>
+< 	<dllmap os="!windows,osx" dll="ssleay32" target="libssl.so"/>
+---
+> 	<dllmap os="!windows,osx" dll="libeay32" target="/usr/lib/openssl-1.0/libcrypto.so"/>
+> 	<dllmap os="!windows,osx" dll="ssleay32" target="/usr/lib/openssl-1.0/libssl.so"/>
diff --git a/src/sonarr/PKGBUILD b/src/sonarr/PKGBUILD
index e1f45db..00a9c36 100644
--- a/src/sonarr/PKGBUILD
+++ b/src/sonarr/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Daniel Egeberg <daniel.egeberg@gmail.com>
 # Contributor: Justin Dray <justin@dray.be>
 pkgname="sonarr"
-pkgver="2.0.0.4949"
-pkgrel=2
+pkgver="2.0.0.5054"
+pkgrel=1
 pkgdesc="PVR for newsgroup users. Formerly known as NZBDrone"
 arch=(any)
 url="https://sonarr.tv"
@@ -23,7 +23,7 @@ source=("https://update.sonarr.tv/v2/master/mono/NzbDrone.master.${pkgver}.mono.
         "sonarr.service"
         "sonarr.sysusers")
 noextract=()
-sha512sums=('908b836a459cb1b72f9af80450319b5a8d2a5506f5fea678bddf2d44a5bd5c9cd8698fd5e4114eaca106969cb654ed9c7f5d1253323137fe8284ed46be360128'
+sha512sums=('89880baee810ddfbc2dd5068072587d109b9529e951a27640040bb56689288747cb04af511c0fb23bf8f0339dca40a1bd0cedf5e61adf4e84a29652ed34ac36d'
             '84efa2eebd9afe6b74203aefdc3fdbd4088ecfad17dbe929396f1ffc639743b615a9b75566a0b45d6b7925bd5675368015047c6d65c1421ffe8712728f350695'
             'b96d3f204614b2af4b66b34326df86892b7a58bd89e00670fb6af696d4427481d7eeed7d2adc5b0c939df2459daa93001d70376225436d5b94cd3e14e5d73c43'
             '35af6024f61003c83e1b35bc5658bd8dbce65cadb6f06e6415de20f4c25ab4c4f107224c27668810f99c4a00bfd24175176c35a4b660243935aef872a39ebce7')
diff --git a/src/stubby-git/.gitignore b/src/stubby-git/.gitignore
new file mode 100644
index 0000000..0aa806f
--- /dev/null
+++ b/src/stubby-git/.gitignore
@@ -0,0 +1,7 @@
+*.[oa]
+*.zip
+*.gz
+*.pkg.*
+pkg/
+src/
+stubby/
diff --git a/src/targetcli-fb/PKGBUILD b/src/targetcli-fb/PKGBUILD
index a3a6ffa..dc80aef 100644
--- a/src/targetcli-fb/PKGBUILD
+++ b/src/targetcli-fb/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=targetcli-fb
-pkgver=2.1.fb46
+pkgver=2.1.fb47
 pkgrel=1
 pkgdesc="free branch of the targetcli LIO administration shell (iSCSI + Co)"
 arch=('any')
@@ -16,7 +16,7 @@ backup=()
 options=()
 install=
 source=(https://github.com/open-iscsi/targetcli-fb/archive/v${pkgver}.tar.gz)
-sha512sums=('239b59c3c9367f6e35e3a207aa1d605c99bc28dad07ae9cda7ffb1a9a2c7fdcb388708882369f73c6fb188f33d1dd9e45b8684826f274a1a71b51dec9be487ed')
+sha512sums=('1b0ed2730cce7d4ec9b0b9d7d4d5cfe6836dae16824859730d8ef5f61ad31ca4a5a25abd2a54af93ae7611715918683538dadfa885a80b4591cc23a60b44d08d')
 
 
 build() {
diff --git a/src/ttf-oxygen/PKGBUILD b/src/ttf-oxygen/PKGBUILD
index 8a79f15..08506da 100644
--- a/src/ttf-oxygen/PKGBUILD
+++ b/src/ttf-oxygen/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Michael Straube <straubem@gmx.de>
+# Maintainer: David Phillips <david@sighup.nz>
+# Contributor: Michael Straube <straubem@gmx.de>
 # Contributor: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Antonio Rojas <arojas@archlinux.org>
@@ -6,17 +7,16 @@
 pkgname=ttf-oxygen
 epoch=1
 pkgver=5.4.3
-pkgrel=3
+pkgrel=4
 pkgdesc='A desktop/gui font family for integrated use with the KDE desktop'
 url='https://projects.kde.org/projects/kde/workspace/oxygen-fonts'
-arch=('i686' 'x86_64' 'armv7h') # CMake files are arch-dependent
+arch=('any')
 license=('custom:OFL' 'GPL' 'custom:GPL+FE')
-depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-makedepends=('extra-cmake-modules' 'fontforge')
+makedepends=('extra-cmake-modules' 'fontforge' 'qt5-base')
 provides=('ttf-font')
 options=('!emptydirs')
-source=("https://download.kde.org/stable/plasma/$pkgver/oxygen-fonts-$pkgver.tar.xz")
-sha256sums=('a02f6580e9a53cb16694a99adbb6dbf76f17584f3e97f469a22286299507838c')
+source=("https://cgit.kde.org/oxygen-fonts.git/snapshot/oxygen-fonts-${pkgver}.tar.xz")
+sha256sums=('c240a0ecf5c0acbc638f0ae16a87b1733a8f1f0512374923c1ee1be694ac72fe')
 
 prepare() {
   mkdir -p build
diff --git a/src/xboxdrv/PKGBUILD b/src/xboxdrv/PKGBUILD
index 828fc1c..7569e32 100644
--- a/src/xboxdrv/PKGBUILD
+++ b/src/xboxdrv/PKGBUILD
@@ -4,24 +4,31 @@
 
 pkgname=xboxdrv
 pkgver=0.8.8
-pkgrel=2
+pkgrel=4
 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}")
+depends=('libx11' 'dbus-glib' 'libusb' 'python2-dbus' 'systemd')
+makedepends=('scons' 'boost' 'pkg-config' 'libx11' 'python')
+backup=("etc/default/xboxdrv")
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xboxdrv/${pkgname}/archive/v${pkgver}.tar.gz
-        ${pkgname}.service
-        ${pkgname}.default)
+        xboxdrv.service
+        xboxdrv.default
+        fix-60-sec-delay.patch
+        scons-py3.patch)
 sha512sums=('3f27856da211a14e27a84fa5919da7965262adc36da16c75eed9bae891098183b5751a3e707573b4ab64e69096ea74d455e8f64827c88b38b65af94cc13b34ad'
             'f1a4e7b1a06e951c3a4f5bcdec5f14db542b34963950619f0d4b1ee324d64b18ca2f63642719ef65a63e424702fb0eb33e0259937906732e587b96a9582c2e6b'
-            '4f6e9a12b208254e19daba477dd7787147a8b2c8a83007d92f8cfce6212c21ce3306f23a2669080f0e46986ca102ab08c262b42c678caf1a891326b4e2c40b5f')
+            '4f6e9a12b208254e19daba477dd7787147a8b2c8a83007d92f8cfce6212c21ce3306f23a2669080f0e46986ca102ab08c262b42c678caf1a891326b4e2c40b5f'
+            '58170b3f96f02e5ba0af5f6641482fb1c612ca70650e475d68b55c05a62ec0831033190b90e591d593fd6b25c2a155e6c4975f37eef1534245947156a5e3285f'
+            'b3a3bbb51fa1c4ad4dd898136c3bf7c0f13193bdd07bbcb5c8243edb747c68223fe8c5bd2fd578f6c2b18844827524abb0533ce98b6e0e60fe936597cdba811d')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   sed 's|python|python2|g' -i examples/*.py
+  patch -p1 < "${srcdir}/fix-60-sec-delay.patch"
+  # activate this patch when scons gets switched back to py3
+  # patch -p1 < "${srcdir}/scons-py3.patch"
 }
 
 build() {
diff --git a/src/xboxdrv/fix-60-sec-delay.patch b/src/xboxdrv/fix-60-sec-delay.patch
new file mode 100644
index 0000000..da543d2
--- /dev/null
+++ b/src/xboxdrv/fix-60-sec-delay.patch
@@ -0,0 +1,27 @@
+From 7326421eeaadbc2aeb3828628c2e65bb7be323a9 Mon Sep 17 00:00:00 2001
+From: buxit <buti@bux.at>
+Date: Wed, 2 Nov 2016 16:25:14 +0100
+Subject: [PATCH] fix 60 seconds delay
+
+use `libusb_handle_events_timeout_completed()` instead of `libusb_handle_events()`
+should fix #144
+---
+ src/usb_gsource.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/usb_gsource.cpp b/src/usb_gsource.cpp
+index 00bf1315..afb38f65 100644
+--- a/src/usb_gsource.cpp
++++ b/src/usb_gsource.cpp
+@@ -174,7 +174,10 @@ USBGSource::on_source_dispatch(GSource* source, GSourceFunc callback, gpointer u
+ gboolean
+ USBGSource::on_source()
+ {
+-  libusb_handle_events(NULL);
++  struct timeval to;
++  to.tv_sec = 0;
++  to.tv_usec = 0;
++  libusb_handle_events_timeout_completed(NULL, &to, NULL);
+   return TRUE;
+ }
+ 
diff --git a/src/xboxdrv/scons-py3.patch b/src/xboxdrv/scons-py3.patch
new file mode 100644
index 0000000..4aa6fa6
--- /dev/null
+++ b/src/xboxdrv/scons-py3.patch
@@ -0,0 +1,63 @@
+From 17bd43a7d3ef86216abc36b42b4e6a1f70aa9979 Mon Sep 17 00:00:00 2001
+From: xnick <xnick@users.noreply.github.com>
+Date: Thu, 12 Oct 2017 20:34:35 +0300
+Subject: [PATCH] Update SConstruct
+
+python3 compatible
+---
+ SConstruct | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 4cd79704..c0007054 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -19,7 +19,7 @@ def build_dbus_glue(target, source, env):
+     xml = re.sub(r"callback = \(([A-Za-z_]+)\) \(marshal_data \? marshal_data : cc->callback\);",
+                  r"union { \1 fn; void* obj; } conv;\n  "
+                  "conv.obj = (marshal_data ? marshal_data : cc->callback);\n  "
+-                 "callback = conv.fn;", xml)
++                 "callback = conv.fn;", xml.decode('utf-8'))
+ 
+     with open(target[0].get_path(), "w") as f:
+         f.write(xml)
+@@ -29,10 +29,10 @@ def build_bin2h(target, source, env):
+     Takes a list of files and converts them into a C source that can be included
+     """
+     def c_escape(str): 
+-        return str.translate(string.maketrans("/.-", "___"))
++        return str.translate(bytes.maketrans(b"/.-", b"___"))
+     
+-    print target
+-    print source
++    print(target)
++    print(source)
+     with open(target[0].get_path(), "w") as fout:
+         fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n")
+ 
+@@ -45,8 +45,8 @@ def build_bin2h(target, source, env):
+                 data = fin.read()
+                 fout.write("// \"%s\"\n" % src.get_path())
+                 fout.write("const char %s[] = {" % c_escape(src.get_path()))
+-                bytes_arr = ["0x%02x" % ord(c) for c in data]
+-                for i in xrange(len(bytes_arr)):
++                bytes_arr = ["0x%02x" % c for c in data]
++                for i in range(len(bytes_arr)):
+                     if i % 13 == 0:
+                         fout.write("\n  ")
+                     fout.write(bytes_arr[i])
+@@ -131,12 +131,12 @@ env.Append(CPPDEFINES = { 'PACKAGE_VERSION': "'\"%s\"'" % package_version })
+ conf = Configure(env)
+ 
+ if not conf.env['CXX']:
+-    print "g++ must be installed!"
++    print('g++ must be installed!')
+     Exit(1)
+ 
+ # X11 checks
+ if not conf.CheckLibWithHeader('X11', 'X11/Xlib.h', 'C++'):
+-    print 'libx11-dev must be installed!'
++    print('libx11-dev must be installed!')
+     Exit(1)
+ 
+ env = conf.Finish()