diff --git a/bucket/oraclejdk.json b/bucket/oraclejdk.json
index 35c930272..6cd56d63b 100644
--- a/bucket/oraclejdk.json
+++ b/bucket/oraclejdk.json
@@ -1,8 +1,8 @@
 {
     "description": "Oracle JDK",
-    "homepage": "https://www.oracle.com/technetwork/java/javase/overview/index.html",
+    "homepage": "https://www.oracle.com/java/",
     "version": "13.0.2-8",
-    "license": "https://java.com/otnlicense",
+    "license": "https://www.oracle.com/downloads/licenses/javase-license1.html",
     "architecture": {
         "64bit": {
             "url": "https://download.oracle.com/otn-pub/java/jdk/13.0.2+8/d4173c853231432d94f001e99d882ca7/jdk-13.0.2_windows-x64_bin.zip",
@@ -18,8 +18,8 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.oracle.com/technetwork/java/javase/downloads/jdk13-downloads-5672538.html",
-        "re": "otn-pub/java/jdk/(?<path>(?<major>[\\d.]+)\\+(?<build>[\\d]+)/(?<hash>[a-fA-F0-9]{32})/jdk-(?:.*?)_windows-x64_bin.zip)",
+        "url": "https://www.oracle.com/java/technologies/javase-jdk13-downloads.html",
+        "re": "otn-pub/java/jdk/(?<path>(?<major>(?<feature>[\\d]+).0.(?<update>[\\d]+))\\+(?<build>[\\d]+)/(?<hash>[a-fA-F0-9]{32})/jdk-(?:.*?)_windows-x64_bin.zip)",
         "replace": "${major}-${build}"
     },
     "autoupdate": {
@@ -29,8 +29,8 @@
             }
         },
         "hash": {
-            "url": "https://www.oracle.com/technetwork/java/javase/downloads/jdk13-downloads-5672538.html",
-            "find": "$basename.*([a-fA-F0-9]{64})\"};"
+            "url": "https://www.oracle.com/webfolder/s/digest/$matchFeature-0-$matchUpdate-checksum.html",
+            "find": "$basename.*([a-fA-F0-9]{64})"
         },
         "extract_dir": "jdk-$matchMajor"
     }
diff --git a/bucket/oraclejdk13.json b/bucket/oraclejdk13.json
index 715f5c503..3121d8cfe 100644
--- a/bucket/oraclejdk13.json
+++ b/bucket/oraclejdk13.json
@@ -1,8 +1,8 @@
 {
-    "description": "Oracle JDK 12",
-    "homepage": "https://www.oracle.com/technetwork/java/javase/overview/index.html",
+    "description": "Oracle JDK 13",
+    "homepage": "https://www.oracle.com/java/",
     "version": "13.0.2-8",
-    "license": "https://java.com/otnlicense",
+    "license": "https://www.oracle.com/downloads/licenses/javase-license1.html",
     "architecture": {
         "64bit": {
             "url": "https://download.oracle.com/otn-pub/java/jdk/13.0.2+8/d4173c853231432d94f001e99d882ca7/jdk-13.0.2_windows-x64_bin.zip",
@@ -18,8 +18,8 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.oracle.com/technetwork/java/javase/downloads/jdk13-downloads-5672538.html",
-        "re": "otn-pub/java/jdk/(?<path>(?<major>[\\d.]+)\\+(?<build>[\\d]+)/(?<hash>[a-fA-F0-9]{32})/jdk-(?:.*?)_windows-x64_bin.zip)",
+        "url": "https://www.oracle.com/java/technologies/javase-jdk13-downloads.html",
+        "re": "otn-pub/java/jdk/(?<path>(?<major>(?<feature>[\\d]+).0.(?<update>[\\d]+))\\+(?<build>[\\d]+)/(?<hash>[a-fA-F0-9]{32})/jdk-(?:.*?)_windows-x64_bin.zip)",
         "replace": "${major}-${build}"
     },
     "autoupdate": {
@@ -29,8 +29,8 @@
             }
         },
         "hash": {
-            "url": "https://www.oracle.com/technetwork/java/javase/downloads/jdk13-downloads-5672538.html",
-            "find": "$basename.*([a-fA-F0-9]{64})\"};"
+            "url": "https://www.oracle.com/webfolder/s/digest/$matchFeature-0-$matchUpdate-checksum.html",
+            "find": "$basename.*([a-fA-F0-9]{64})"
         },
         "extract_dir": "jdk-$matchMajor"
     }