diff --git a/create_pivccu3.sh b/create_pivccu3.sh
index 3f4f037..c935123 100755
--- a/create_pivccu3.sh
+++ b/create_pivccu3.sh
@@ -5,7 +5,7 @@ CCU_DOWNLOAD_SPLASH_URL="https://www.eq-3.de/service/downloads.html"
 CCU_DOWNLOAD_URL="https://www.eq-3.de/downloads/software/firmware/ccu3-firmware/ccu3-$CCU_VERSION.tgz"
 CCU_DOWNLOAD_URL="https://homematic-ip.com/sites/default/files/downloads/ccu3-$CCU_VERSION.tgz"
 
-PKG_BUILD=86
+PKG_BUILD=87
 
 function throw {
   echo $1
@@ -115,13 +115,14 @@ run "Build armhf package" dpkg-deb --build -Zxz pivccu3-$PKG_VERSION
 run "Copy armhf package to local directory" cp pivccu3-$PKG_VERSION.deb $CURRENT_DIR/pivccu3-$PKG_VERSION-armhf.deb
 
 function add_openjdk {
-  run "Download openjdk-8-jre.deb" wget -O openjdk-8-jre.deb http://archive.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre_8u332-ga-1~deb9u1_armhf.deb
-  run "Download openjdk-8-jre-headless.deb" wget -O openjdk-8-jre-headless.deb http://archive.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre-headless_8u332-ga-1~deb9u1_armhf.deb
+  run "Download openjdk-11-jre.deb" wget -O openjdk-11-jre.deb https://archive.debian.org/debian/pool/main/o/openjdk-11/openjdk-11-jre_11.0.6+10-1~bpo9+1_armhf.deb
+  run "Download openjdk-11-jre-headless.deb" wget -O openjdk-11-jre-headless.deb https://archive.debian.org/debian/pool/main/o/openjdk-11/openjdk-11-jre-headless_11.0.6+10-1~bpo9+1_armhf.deb
 
-  run "Extract openjdk-8-jre.deb" dpkg-deb -x openjdk-8-jre.deb .
-  run "Extract openjdk-8-jre-headless.deb" dpkg-deb -x openjdk-8-jre-headless.deb .
+  run "Extract openjdk-11-jre.deb" dpkg-deb -x openjdk-11-jre.deb .
+  run "Extract openjdk-11-jre-headless.deb" dpkg-deb -x openjdk-11-jre-headless.deb .
 
-  run "Copy openjdk files" mv usr/lib/jvm/java-8-openjdk-armhf/jre $CNT_ROOTFS/opt/openjdk
+  run "Copy openjdk files" mv usr/lib/jvm/java-11-openjdk-armhf $CNT_ROOTFS/opt/openjdk
+  run "Copy openjdk files" mv etc/java-11-openjdk $CNT_ROOTFS/etc
   run "Remove old jdk files" rm -f $CNT_ROOTFS/opt/java
   run "Create java symlink" ln -s /opt/openjdk $CNT_ROOTFS/opt/java
 }