diff --git a/files/use-openjdk-8.patch b/files/use-openjdk-8.patch
new file mode 100644
--- /dev/null
+++ b/files/use-openjdk-8.patch
@@ -0,0 +1,35 @@
+From c5d1f4774bd9a6b76d7d88323deaf6861fb876d5 Mon Sep 17 00:00:00 2001
+From: Fabio Forni <livingsilver94.solus@redaril.me>
+Date: Fri, 1 May 2020 15:18:34 +0200
+Subject: [PATCH] Run with openjdk-8
+
+---
+ build/linux/dist/arduino | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
+index f70c650..805589e 100755
+--- a/build/linux/dist/arduino
++++ b/build/linux/dist/arduino
+@@ -19,11 +19,6 @@ export PATH="${APPDIR}/java/bin:${PATH}"
+ 
+ export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
+ 
+-JAVA=java
+-if [ -x "$APPDIR/java/bin/java" ]; then
+-  JAVA=$APPDIR/java/bin/java
+-fi
+-
+ # Collect options to java in an array, to properly handle whitespace in options
+ JAVA_OPTIONS=("-DAPP_DIR=$APPDIR")
+ 
+@@ -32,5 +27,5 @@ if [[ "$@" != *"--"* ]] ; then
+ 	JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png")
+ fi
+ 
+-"$JAVA" "${JAVA_OPTIONS[@]}" processing.app.Base "$@"
++/usr/lib64/openjdk-8/bin/java "${JAVA_OPTIONS[@]}" processing.app.Base "$@"
+ 
+-- 
+2.26.2
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : arduino
 version    : 1.8.12
-release    : 4
+release    : 5
 source     :
     - https://github.com/arduino/Arduino/archive/1.8.12.tar.gz : f4723f49c9dd462f003f4fde712b89d2439582be028f593f92b7b904d074523b
     - https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.10/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip : 0d70f3aa3cd7dc46cc402fc0a915519e7cf8af6cdc544458c182394d5fc3452f
@@ -35,6 +35,8 @@
     export CTAGS_DIR=$workdir/build/ctags
     export CTAGS_VERSION=ctags-5.8-arduino11
 setup      : |
+    %patch -p1 < $pkgfiles/use-openjdk-8.patch
+
     # copy dependency libraries
     cp $sources/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip $workdir/build/shared/
     cp $sources/libastylej-2.05.1-5.zip $workdir/build/
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>arduino</Name>
         <Packager>
-            <Name>Mislav Čakarić</Name>
-            <Email>mcakaric@gmail.com</Email>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
         </Packager>
         <License>GPL-2.0-or-later</License>
         <PartOf>programming.ide</PartOf>
@@ -902,12 +902,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="4">
-            <Date>2020-03-25</Date>
+        <Update release="5">
+            <Date>2020-05-01</Date>
             <Version>1.8.12</Version>
             <Comment>Packaging update</Comment>
-            <Name>Mislav Čakarić</Name>
-            <Email>mcakaric@gmail.com</Email>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file