diff --git a/extra/java-openjdk/PKGBUILD b/extra/java-openjdk/PKGBUILD
index 08f405132..e1b49f4be 100644
--- a/extra/java-openjdk/PKGBUILD
+++ b/extra/java-openjdk/PKGBUILD
@@ -20,13 +20,15 @@
 
 pkgbase=java-openjdk
 pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src')
-_majorver=12
+_majorver=13
 _minorver=0
-_securityver=2
-_updatever=10
+_securityver=0
+_updatever=33
 pkgrel=1
-pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
-_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+#pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
+pkgver=${_majorver}.u${_updatever}
+#_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+_hg_tag=jdk-${_majorver}+${_updatever}
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
@@ -38,10 +40,10 @@ source=(http://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_ta
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
         freedesktop-jshell.desktop)
-sha256sums=('b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb'
-            '779dba7cf4f5de7cd512adf969354ec4aefddb33d970757eb3c49ea1fd8d5184'
-            'fa67642a8ba1173c30536a12dfbeeacf5d0f37918849057c1049b88a81f261ed'
-            '0a1d66a3e4774d7fad267c8a4e726ecf362ae2f33df12439567e0fb249655c48')
+sha256sums=('25a7b7863fd63f6504abc7c01e8c73269d96d1bdfd95b91e4a3ea65432695327'
+            '4edd8475037062cdff87993c1745ddb6df31f49e76c2774bca3841da70675580'
+            'd759e5e360abe9fae7b5f87498f81dd786aa568aa997d0cb8ba3e75fa0c364dd'
+            '939b2d8b24f18ad82c4868880e337c6291daee9b7edcfeadb8951bf99d6c2acc')
 
 case "${CARCH}" in
   x86_64) _JARCH='x86_64';;
diff --git a/extra/java-openjdk/freedesktop-java.desktop b/extra/java-openjdk/freedesktop-java.desktop
index acd8701d7..dbbd26bc1 100644
--- a/extra/java-openjdk/freedesktop-java.desktop
+++ b/extra/java-openjdk/freedesktop-java.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Name=OpenJDK Java 12 Runtime
-Name[fi]=OpenJDK Java 12 - ajonaikainen ympäristö
-Comment=OpenJDK Java 12 Runtime
-Comment[fi]=OpenJDK Java 12 - ajonaikainen ympäristö
+Name=OpenJDK Java 13 Runtime
+Name[fi]=OpenJDK Java 13 - ajonaikainen ympäristö
+Comment=OpenJDK Java 13 Runtime
+Comment[fi]=OpenJDK Java 13 - ajonaikainen ympäristö
 Keywords=java;runtime
-Exec=/usr/lib/jvm/java-12-openjdk/bin/java -jar
+Exec=/usr/lib/jvm/java-13-openjdk/bin/java -jar
 Terminal=false
 Type=Application
-Icon=java12-openjdk
+Icon=java13-openjdk
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
 NoDisplay=true
diff --git a/extra/java-openjdk/freedesktop-jconsole.desktop b/extra/java-openjdk/freedesktop-jconsole.desktop
index acb6472d1..6252b0d26 100644
--- a/extra/java-openjdk/freedesktop-jconsole.desktop
+++ b/extra/java-openjdk/freedesktop-jconsole.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Name=OpenJDK Java 12 Console
-Name[fi]=OpenJDK Java 12 - konsoli
-Comment=OpenJDK Java 12 Monitoring & Management Console
-Comment[fi]=OpenJDK Java 12 - valvonta- ja hallintakonsoli
+Name=OpenJDK Java 13 Console
+Name[fi]=OpenJDK Java 13 - konsoli
+Comment=OpenJDK Java 13 Monitoring & Management Console
+Comment[fi]=OpenJDK Java 13 - valvonta- ja hallintakonsoli
 Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-12-openjdk/bin/jconsole
+Exec=/usr/lib/jvm/java-13-openjdk/bin/jconsole
 Terminal=false
 Type=Application
-Icon=java12-openjdk
+Icon=java13-openjdk
 Categories=Application;System;
diff --git a/extra/java-openjdk/freedesktop-jshell.desktop b/extra/java-openjdk/freedesktop-jshell.desktop
index 16110b86b..6a684b24b 100644
--- a/extra/java-openjdk/freedesktop-jshell.desktop
+++ b/extra/java-openjdk/freedesktop-jshell.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=OpenJDK Java 12 Shell
-Comment=OpenJDK Java 12 Shell
+Name=OpenJDK Java 13 Shell
+Comment=OpenJDK Java 13 Shell
 Keywords=java;shell
-Exec=/usr/lib/jvm/java-12-openjdk/bin/jshell
+Exec=/usr/lib/jvm/java-13-openjdk/bin/jshell
 Terminal=true
 Type=Application
-Icon=java12-openjdk
+Icon=java13-openjdk
 Categories=Application;System;
diff --git a/extra/java-openjdk/install_jdk-openjdk.sh b/extra/java-openjdk/install_jdk-openjdk.sh
index cf97693a4..2e9dc1999 100644
--- a/extra/java-openjdk/install_jdk-openjdk.sh
+++ b/extra/java-openjdk/install_jdk-openjdk.sh
@@ -1,4 +1,4 @@
-THIS_JDK='java-12-openjdk'
+THIS_JDK='java-13-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
diff --git a/extra/java-openjdk/install_jre-openjdk-headless.sh b/extra/java-openjdk/install_jre-openjdk-headless.sh
index a340d0bef..c498dadf1 100644
--- a/extra/java-openjdk/install_jre-openjdk-headless.sh
+++ b/extra/java-openjdk/install_jre-openjdk-headless.sh
@@ -1,4 +1,4 @@
-THIS_JRE='java-12-openjdk'
+THIS_JRE='java-13-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
diff --git a/extra/java-openjdk/install_jre-openjdk.sh b/extra/java-openjdk/install_jre-openjdk.sh
index 03d45d071..408226ebc 100644
--- a/extra/java-openjdk/install_jre-openjdk.sh
+++ b/extra/java-openjdk/install_jre-openjdk.sh
@@ -1,4 +1,4 @@
-THIS_JRE='java-12-openjdk'
+THIS_JRE='java-13-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then