diff --git a/devel/opencl/Makefile b/devel/opencl/Makefile
index 0f9df6d69ea1b..506049f589255 100644
--- a/devel/opencl/Makefile
+++ b/devel/opencl/Makefile
@@ -1,12 +1,7 @@
-# Created by: O. Hartmann <ohartmann@walstatt.org>
-
 PORTNAME=	opencl
-PORTVERSION=	3.0
+PORTVERSION=	3.0.8
 CATEGORIES=	devel
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	d7283be010f2.patch:-p2 # https://github.com/KhronosGroup/OpenCL-Headers/pull/93
-
 MAINTAINER=	ohartmann@walstatt.org
 COMMENT=	Open Computing Language (OpenCL) specifications V3.0 (header files)
 
@@ -18,8 +13,8 @@ GH_PROJECT=	OpenCL-Headers OpenCL-CLHPP:clhpp
 GH_TAGNAME=	${HEADER_TAG} ${CLHPP_TAG}:clhpp
 
 # the header releases don't have tags yet, so use git commit for now
-HEADER_TAG=	b04034a
-CLHPP_TAG=	64c206f	#  include missing CL/opencl.hpp
+HEADER_TAG=	v2021.06.30
+CLHPP_TAG=	v2.0.15	#  include missing CL/opencl.hpp
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/devel/opencl/distinfo b/devel/opencl/distinfo
index fdfa5338d2c88..5fdd4e77efafd 100644
--- a/devel/opencl/distinfo
+++ b/devel/opencl/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1606574707
-SHA256 (KhronosGroup-OpenCL-Headers-3.0-b04034a_GH0.tar.gz) = 19246faab53a3937862e6882909053e1389bb6c7ba59adaeac635653b44724d5
-SIZE (KhronosGroup-OpenCL-Headers-3.0-b04034a_GH0.tar.gz) = 54762
-SHA256 (KhronosGroup-OpenCL-CLHPP-64c206f_GH0.tar.gz) = 7fd3c7332316cae96b4b27563cecbb268787f9aef7ac043cf31c73760f08f611
-SIZE (KhronosGroup-OpenCL-CLHPP-64c206f_GH0.tar.gz) = 97908
-SHA256 (d7283be010f2.patch) = 74f267b39b49a9733de9bf0a42b3e1d8a0179abcc93e5cf3a6157678f89c4f27
-SIZE (d7283be010f2.patch) = 1175
+TIMESTAMP = 1635006419
+SHA256 (KhronosGroup-OpenCL-Headers-3.0.8-v2021.06.30_GH0.tar.gz) = 6640d590c30d90f89351f5e3043ae6363feeb19ac5e64bc35f8cfa1a6cd5498e
+SIZE (KhronosGroup-OpenCL-Headers-3.0.8-v2021.06.30_GH0.tar.gz) = 59866
+SHA256 (KhronosGroup-OpenCL-CLHPP-v2.0.15_GH0.tar.gz) = 0175806508abc699586fc9a9387e01eb37bf812ca534e3b493ff3091ec2a9246
+SIZE (KhronosGroup-OpenCL-CLHPP-v2.0.15_GH0.tar.gz) = 99826
diff --git a/devel/opencl/pkg-plist b/devel/opencl/pkg-plist
index c38836a7ee353..6eed5911adb17 100644
--- a/devel/opencl/pkg-plist
+++ b/devel/opencl/pkg-plist
@@ -11,6 +11,7 @@ include/CL/cl_gl.h
 include/CL/cl_gl_ext.h
 include/CL/cl_half.h
 include/CL/cl_icd.h
+include/CL/cl_layer.h
 include/CL/cl_platform.h
 include/CL/cl_va_api_media_sharing_intel.h
 include/CL/cl_version.h