diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 5ba2c028fb93..b43b73cdcba5 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -25,7 +25,7 @@ USES=		compiler:features gmake iconv pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	battleblow
-GH_PROJECT=	openjdk-jdk8u
+GH_PROJECT=	jdk8u
 GH_TAGNAME=	jdk${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-b${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
 
 _MAKE_JOBS=	#
@@ -49,8 +49,8 @@ INSTALLDIR=	${PREFIX}/${PKGBASE}
 NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	8
-JDK_UPDATE_VERSION=	292
-JDK_BUILD_NUMBER=	10
+JDK_UPDATE_VERSION=	302
+JDK_BUILD_NUMBER=	08
 BSD_JDK_VERSION=	1
 JTREG_VERSION=		4.1
 JTREG_BUILD_NUMBER=	b08
diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo
index c37387c70a22..9634132d27eb 100644
--- a/java/openjdk8/distinfo
+++ b/java/openjdk8/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1619829970
-SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c
-SIZE (jtreg4.1-b08.tar.gz) = 6834252
-SHA256 (battleblow-openjdk-jdk8u-8.292.10.1-jdk8u292-b10.1_GH0.tar.gz) = dc49ab57cf5536b54f49ff75a558c74e34dc667a81c5081881b86a52b7ed812f
-SIZE (battleblow-openjdk-jdk8u-8.292.10.1-jdk8u292-b10.1_GH0.tar.gz) = 88549771
+TIMESTAMP = 1627694630
+SHA256 (battleblow-jdk8u-8.302.08.1-jdk8u302-b08.1_GH0.tar.gz) = 783cc53f718717bcdc27d821ce808335da4d8323dc75d883b243fb19e4ca0970
+SIZE (battleblow-jdk8u-8.302.08.1-jdk8u302-b08.1_GH0.tar.gz) = 88617241
diff --git a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp
deleted file mode 100644
index c040f715d4f4..000000000000
--- a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- hotspot/src/os/bsd/vm/os_perf_bsd.cpp.orig	2021-04-26 16:00:48 UTC
-+++ hotspot/src/os/bsd/vm/os_perf_bsd.cpp
-@@ -43,6 +43,15 @@
-   #include <mach/task_info.h>
- #else
-   #ifndef __NetBSD__
-+    #ifdef __FreeBSD__
-+      /*
-+       * Older versions of FreeBSD accidentally include machine/frame.h from
-+       * sys/user.h header. Disable this bad behavior, because a
-+       * 'non-standard' structure 'frame' conflict with an internal structure
-+       * with the same name.
-+       */
-+      #define _MACHINE_PCB_H_
-+    #endif
-     #include <sys/user.h>
-   #endif
-   #include <sys/sched.h>