diff --git a/development/zulu-openjdk8/slack-desc b/development/zulu-openjdk8/slack-desc
index 23369c560f..f30b15f956 100644
--- a/development/zulu-openjdk8/slack-desc
+++ b/development/zulu-openjdk8/slack-desc
@@ -14,6 +14,6 @@ zulu-openjdk8: Java components needed to build and run Java SE applications. Zul
 zulu-openjdk8: has been verified by passing all tests in the Java SE 8 version of
 zulu-openjdk8: the OpenJDK Community Technology Compatibility Kit (TCK).
 zulu-openjdk8:
-zulu-openjdk8: http://zulu.org/
+zulu-openjdk8: https://www.azul.com/downloads/
 zulu-openjdk8:
 zulu-openjdk8:
diff --git a/development/zulu-openjdk8/zulu-openjdk8.SlackBuild b/development/zulu-openjdk8/zulu-openjdk8.SlackBuild
index 1de220c861..4fcacc210e 100644
--- a/development/zulu-openjdk8/zulu-openjdk8.SlackBuild
+++ b/development/zulu-openjdk8/zulu-openjdk8.SlackBuild
@@ -25,26 +25,19 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=zulu-openjdk8
-VERSION=${VERSION:-8.0.232}
-ZULUVERSION=${ZULUVERSION:-8.42.0.23}
+VERSION=${VERSION:-8.0.312}
+ZULUVERSION=${ZULUVERSION:-8.58.0.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-# The name of azul's zulu openjdk source archive has the syntax below :
-#
-#   zulu<ZULU_VERSION>-jdk<JDK_VERSION>-linux_x64
-#
-# Note: The archive's name is also the name of the top directory found
-# in this archive.
-#
-SRCNAM=zulu${ZULUVERSION}-ca-jdk${VERSION}-linux_x64
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i686 ;;
+    x86_64) ARCH=x64 ;;
+  esac
+fi
 
-ARCH=${ARCH:-$(uname -m)}
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -54,7 +47,10 @@ TMP=${TMP:-/tmp/SBo}
 PKG=${TMP}/package-${PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "${ARCH}" = "x86_64" ] ; then
+if [ "$ARCH" = "i686" ]; then
+  LIB_ARCH=i686
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x64" ]; then
   LIB_ARCH=amd64
   LIBDIRSUFFIX="64"
 else
@@ -62,6 +58,8 @@ else
   exit 1
 fi
 
+SRCNAM=zulu${ZULUVERSION}-ca-jdk${VERSION}-linux_$ARCH
+
 set -e
 
 rm -rf $PKG
diff --git a/development/zulu-openjdk8/zulu-openjdk8.info b/development/zulu-openjdk8/zulu-openjdk8.info
index 704846ec99..2d7b174654 100644
--- a/development/zulu-openjdk8/zulu-openjdk8.info
+++ b/development/zulu-openjdk8/zulu-openjdk8.info
@@ -1,10 +1,10 @@
 PRGNAM="zulu-openjdk8"
-VERSION="8.0.232"
-HOMEPAGE="http://zulu.org"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu8.42.0.23-ca-jdk8.0.232-linux_x64.tar.gz"
-MD5SUM_x86_64="755a1e9b77f76d4a6012e4d104a59200"
+VERSION="8.0.312"
+HOMEPAGE="https://www.azul.com/download"
+DOWNLOAD="https://cdn.azul.com/zulu/bin/zulu8.58.0.13-ca-jdk8.0.312-linux_i686.tar.gz"
+MD5SUM="f159e209bfea659582ee5c66d46e5a78"
+DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu8.58.0.13-ca-jdk8.0.312-linux_x64.tar.gz"
+MD5SUM_x86_64="db82cf071e9bb6943e76761a93079f36"
 REQUIRES=""
 MAINTAINER="Sébastien Ballet"
 EMAIL="slacker6896@gmail.com"