diff --git a/.gitignore b/.gitignore
index cf34267..2d33106 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /OpenCL-Headers-49f07d3.tar.gz
 /OpenCL-Headers-96f5bde.tar.gz
 /OpenCL-Headers-5cc337c.tar.gz
+/OpenCL-Headers-d082d42.tar.gz
+/OpenCL-CLHPP-2.0.12.zip
diff --git a/opencl-headers.spec b/opencl-headers.spec
index 48efdce..024517d 100644
--- a/opencl-headers.spec
+++ b/opencl-headers.spec
@@ -1,18 +1,18 @@
-%global commit0 5cc337c890dab1c996cc97b617c578d37a7247bf
+%global commit0 d082d4206597f56d35f3f0a5447343ed6879ae75
 %global date 20200512
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global cl_hpp_ver 2.0.11
+%global cl_hpp_ver 2.0.12
 
 Name:           opencl-headers
 Version:        3.0
-Release:        0%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release:        1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
 Summary:        OpenCL (Open Computing Language) header files
 
 License:        MIT
 URL:            https://www.khronos.org/registry/cl/
 
 Source0:        https://github.com/KhronosGroup/OpenCL-Headers/archive/%{commit0}/OpenCL-Headers-%{commit0}.tar.gz#/OpenCL-Headers-%{shortcommit0}.tar.gz
-Source1:        https://github.com/KhronosGroup/OpenCL-CLHPP/releases/download/v%{cl_hpp_ver}/cl2.hpp
+Source1:        https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v%{cl_hpp_ver}.zip#/OpenCL-CLHPP-%{cl_hpp_ver}.zip
 # OCL 1.2 compatibility
 Source2:        https://www.khronos.org/registry/cl/api/2.1/cl.hpp
 
@@ -24,7 +24,8 @@ BuildArch:      noarch
 %prep
 %autosetup -n OpenCL-Headers-%{commit0}
 
-cp -p %{SOURCE1} %{SOURCE2} .
+%{uncompress:%{SOURCE1}}
+cp -p OpenCL-CLHPP-%{cl_hpp_ver}/include/CL/cl2.hpp %{SOURCE2} .
 
 %build
 # Nothing to build
@@ -53,6 +54,11 @@ rm -vf %{buildroot}%{_includedir}/CL/cl_{dx9,d3d}*
 %{_includedir}/CL/cl.hpp
 
 %changelog
+* Fri Jul 24 2020 Karol Herbst <kherbst@redhat.com> - 3.0-1.20200512gitd082d42
+- Update to latest upstream, pick up new extensions for OpenCL-CTS build fix
+- Rework CLHPP handling as file is not downloadable anymore
+- Bump CLHPP version to 2.0.12
+
 * Wed May 20 2020 Karol Herbst <kherbst@redhat.com> - 3.0-0.20200512git5cc337c
 - Update to latest upstream, pick up new extensions for OpenCL-CTS build fix
 - Bump CLHPP version to 2.0.11
diff --git a/sources b/sources
index b51776c..2f8c3c6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (cl2.hpp) = f220e3dd013596fe3134bf43e2957c293186071460f2a03f6e81e0e7def3213a568d4b29a06b4921cd3488e8626200dcd4693808f0f6c8f88e67d4147ff474e8
 SHA512 (cl.hpp) = 3168642c970a44eb71c0c05e5cf32441ddfc7a7f7d2c159076cd8cc662dc134773ea6a08b2a9414fcf259e5e9e574054966ad015d1578aae52b87efa5b662ad5
-SHA512 (OpenCL-Headers-5cc337c.tar.gz) = b7ddb9258b3b5dda695968b8de460ba4387cd77f91d10a45c4cac4bdb388a7db6b644d94b39d14a04aae875f18d8fad3e218236a85c1adb8f2e51544bc747185
+SHA512 (OpenCL-Headers-d082d42.tar.gz) = 0af8412e53588c43b8f19eebddd2ea9f2d13897660d0b1422299ed4a704de50a520d21b5655cc4d2bc3e448159a752ccd03dad11de38bed550b889eb7ad44869
+SHA512 (OpenCL-CLHPP-2.0.12.zip) = a0a51917fea4fb9f1f3a927aac774da29e991559eced41ffc8257d743f8034d6365cb68808784797a123c47390e836bc65fad2effd555b845e14db3b0eedd5f3