diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index c99d7c271..b839131d1 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -2,11 +2,6 @@
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Boyan Ding <stu_dby@126.com>
 
-# TODO
-# once icedtea:
-#   pulse
-#   add policytool desktop files
-
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - disable distcc
 #  - add arm to _JARCH and _DOC_ARCH
@@ -16,12 +11,11 @@
 
 buildarch=22
 
-# Package 'openjfx' must be updated when this one is
 pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src')
 pkgbase=java8-openjdk
 _java_ver=8
-_jdk_update=212
-_jdk_build=01
+_jdk_update=222
+_jdk_build=05
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
 pkgrel=2
@@ -29,7 +23,7 @@ arch=('x86_64')
 url='http://openjdk.java.net/'
 license=('custom')
 options=('!distcc')
-makedepends=('jdk7-openjdk' 'ccache' 'cpio' 'unzip' 'zip'
+makedepends=('java-environment=8' 'ccache' 'cpio' 'unzip' 'zip'
              'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
 _url_src=http://hg.openjdk.java.net/jdk8u/jdk8u
 source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
@@ -44,14 +38,14 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
         8143245-pr3548.patch
         8197981-pr3548.patch)
 
-sha256sums=('81b5e0c769c8439a8660baae148021a7b6589dde190988dda88580c1d9a5803d'
-            '2a5fe4f4acc92bd325cf487b4c83d03383d97eb54f03eafbf6422e6b2ec8a6b0'
-            'c892af62a60d42b6913a759227383301fb33edff8e623c6e75960798bf0961a2'
-            '08d1b06640ac9dc666820a7ebf52502210b29123c5cad4f26aa3a3851999ad92'
-            'c2f8f7a163429b0dfc3aee4f23dbb9da2fab9dd9a1b9fce06ec789efc2c33c39'
-            'bc530a1894e16f3b5afca69fdddc52caaf2ed719cc4ca09753f9a1b067cbc6c1'
-            'b978a5c459f8da55c7d4a52bf625fce3882f127cebf2f176182227ebd1c98e65'
-            '02cbc8874beab2066061fe277e9249a505987bc01ef8a3b8fff3e2c38ffcfd22'
+sha256sums=('9556cee8070449fd515e1dfb4c23b6499d5dc49586136e17fb8862aff3e37024'
+            '996e17a077a00e4d205f635c38f432a0eee5225e556a35bf6b5d333b72a2d12f'
+            '48955c5d073129b57bb2a03f27397a1eb74aaaa3459663848dbd896ccd8ad9de'
+            '66f1805fdd465813618399ac1bd3b4fbe87a2820afb803cfb6d59a45eebfe51f'
+            '92e876099a42001e8c8ec749cc00f10a9e2d8d5dba57d8e15e20d05d02474460'
+            '465b40d283fd2063e4422c3c7f2a43da0dcfe70e8125442cff9134436c8a18d1'
+            '845e3c106beb7319180adcb41a0f5d40de169453291da4050b326f828de7d8c7'
+            '96673ee96926ee942148a3e8cc381e172db550bc9af9e230ac0526b45d65234c'
             'f3def2ef78d96f136d9d0a103c84028789ae9e0de961a11240091b6ae60d8212'
             '84db3cb182a998ba184c90f56636e5398b839b3dc7128eaeba966d78c0b6fc56'
             'c0bb1ae19f08c221156df15d7d8c5a4168c55179a186f3054dd4ac0591ec8501')
@@ -91,7 +85,7 @@ build() {
   # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
   export MAKEFLAGS=${MAKEFLAGS/-j*}
 
-  # We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
+  # Avoid optimization of HotSpot being lowered from O3 to O2
   export CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS} -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks"
   export CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}"
 
@@ -174,7 +168,7 @@ package_jre8-openjdk-headless() {
   mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
 
   # Remove 'non-headless' lib files
-  for f in ${_nonheadless[@]}; do
+  for f in "${_nonheadless[@]}"; do
     rm "${pkgdir}${_jvmdir}/jre/${f}"
   done
 
@@ -204,7 +198,7 @@ package_jre8-openjdk-headless() {
   ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
 
   # Move config files that were set in _backup_etc from ./lib to /etc
-  for file in ${_backup_etc[@]}; do
+  for file in "${_backup_etc[@]}"; do
     _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-8-openjdk/}
     install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}"
     ln -sf /${file} "${pkgdir}${_filepkgpath}"
@@ -218,15 +212,13 @@ package_jre8-openjdk() {
               'alsa-lib: for basic sound support'
               'gtk2: for the Gtk+ look and feel - desktop usage'
               'java8-openjfx: for JavaFX GUI components support')
-  # TODO when adding IcedTea: 'giflib: for gif format support'
-  # TODO when adding IcedTea: 'libpulse: for advanced sound support'
   provides=('java-runtime=8' 'java-runtime-openjdk=8')
   install=install_jre8-openjdk.sh
   replaces=('jre8-openjdk-wm')
 
   cd ${_imgdir}/jre
 
-  for f in ${_nonheadless[@]}; do
+  for f in "${_nonheadless[@]}"; do
     install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}"
   done
 
@@ -241,11 +233,6 @@ package_jre8-openjdk() {
   done
   popd
 
-  # Desktop files
-  # TODO add these when switching to IcedTea
-  #install -D -m 644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" \
-  #                  "${pkgdir}/usr/share/applications/policytool.desktop"
-
   # Install license
   install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
   ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/java8-openjdk/install_jre8-openjdk-headless.sh b/extra/java8-openjdk/install_jre8-openjdk-headless.sh
index 5d7a0de43..7a1680974 100644
--- a/extra/java8-openjdk/install_jre8-openjdk-headless.sh
+++ b/extra/java8-openjdk/install_jre8-openjdk-headless.sh
@@ -25,7 +25,7 @@ post_install() {
   esac
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-     /usr/bin/update-ca-trust
+    /usr/bin/update-ca-trust
   fi
 }