diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index d9dc1c97d..e572204db 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -12,11 +12,13 @@
 #  - configure with --with-jvm-variants=zero
 #  - adjust doc package to use linux-${_DOC_ARCH}-normal-zero-release instead of normal-server-release
 #  - prevent downgrading hotspot optimization with CFLAGS
+#  - drop building docs and its package; takes forever to build
+#  - upstream hotspot patch
 
 buildarch=22
 
 # Package 'openjfx' must be updated when this one is
-pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc')
+pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src')
 pkgbase=java8-openjdk
 _java_ver=8
 # Found @ http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
@@ -24,7 +26,7 @@ _jdk_update=162
 _jdk_build=12
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=2
+pkgrel=2.1
 arch=('x86_64')
 url='http://openjdk.java.net/'
 license=('custom')
@@ -39,7 +41,8 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
         jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
         jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
         langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
-        nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
+        nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
+        http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/raw-rev/8bd024c567e7)
 
 sha256sums=('7ad155f34bae7bfb43b5f74972f61cf2d390be9d068d7825af8416fe098f15b1'
             'd45747d3ef7bfff09e48391b10e9264619c2e3c65708cdf62fa3c4c4f724bf88'
@@ -48,7 +51,8 @@ sha256sums=('7ad155f34bae7bfb43b5f74972f61cf2d390be9d068d7825af8416fe098f15b1'
             'c576306038e548071a0c9904dd0ef82e1ada4dba8acf865b065672356c256dde'
             'c45c2bc4519992d78666c81b5faa33d7b40e268c8ae5c17ac1b7726fdf8e16d4'
             'b0dae1ddc9113d6ce5e7afc0a75284f913ab2d8f21c56b2378962037947629ec'
-            'b8a89d7870c332055e4bde9ca7a4183b4de1a280709de29f18a6867dd1eb8296')
+            'b8a89d7870c332055e4bde9ca7a4183b4de1a280709de29f18a6867dd1eb8296'
+            '6709d64538633098b34bac47b57679573cf9240f8ff91f4370a993fe112bc381')
 
 case "${CARCH}" in
   'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -72,6 +76,9 @@ prepare() {
   do
     ln -s ../${subrepo}-${_repo_ver} ${subrepo}
   done
+
+  cd ../hotspot-${_repo_ver}
+  patch -p1 -i ../8bd024c567e7
 }
 
 build() {
@@ -81,7 +88,7 @@ build() {
   # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
   export MAKEFLAGS=${MAKEFLAGS/-j*}
   # https://hydra.nixos.org/build/41230444/log
-  export CFLAGS="-Wno-error=deprecated-declarations -fno-lifetime-dse -fno-delete-null-pointer-checks"
+  export CFLAGS+=" -Wno-error=deprecated-declarations -fno-lifetime-dse -fno-delete-null-pointer-checks"
 
   # prevent downgrading hotspot optimization
   CFLAGS=`echo $CFLAGS | sed -e 's/-O2//'` && CXXFLAGS="$CFLAGS"
@@ -106,7 +113,7 @@ build() {
   # These help to debug builds:
   #LOG=trace HOTSPOT_BUILD_JOBS=1
 
-  make docs
+  #make docs
 
   # FIXME sadly 'DESTDIR' is not used here!
   make install
@@ -290,11 +297,3 @@ package_openjdk8-src() {
 
   install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
 }
-
-package_openjdk8-doc() {
-  pkgdesc='OpenJDK Java 8 documentation'
-
-  install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/"
-  cp -r "${srcdir}"/jdk8u-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-zero-release/docs/* \
-    "${pkgdir}/usr/share/doc/${pkgbase}/"
-}