diff --git a/.gitignore b/.gitignore
index 42da4d2..b7922d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /OpenCL-Headers-d082d42.tar.gz
 /OpenCL-CLHPP-2.0.12.zip
 /OpenCL-Headers-d65bcc5.tar.gz
+/OpenCL-CLHPP-2.0.13.tar.gz
+/OpenCL-Headers-1d3dc4e.tar.gz
diff --git a/opencl-headers.spec b/opencl-headers.spec
index 5f50332..b006d41 100644
--- a/opencl-headers.spec
+++ b/opencl-headers.spec
@@ -1,18 +1,18 @@
-%global commit0 d65bcc5123f93ce7c6b2a3c164fed35c423fc83d
-%global date 20201007
+%global commit0 1d3dc4e7562ac56ee8ab00607af7bd55fb091f22
+%global date 20210426
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global cl_hpp_ver 2.0.12
+%global cl_hpp_ver 2.0.13
 
 Name:           opencl-headers
 Version:        3.0
-Release:        4%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release:        5%{?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/archive/v%{cl_hpp_ver}.zip#/OpenCL-CLHPP-%{cl_hpp_ver}.zip
+Source0:        https://github.com/KhronosGroup/OpenCL-Headers/archive/%{commit0}/OpenCL-Headers-%{shortcommit0}.tar.gz
+Source1:        https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v%{cl_hpp_ver}/OpenCL-CLHPP-%{cl_hpp_ver}.tar.gz
 # OCL 1.2 compatibility
 Source2:        https://www.khronos.org/registry/cl/api/2.1/cl.hpp
 
@@ -24,7 +24,7 @@ BuildArch:      noarch
 %prep
 %autosetup -n OpenCL-Headers-%{commit0}
 
-%{uncompress:%{SOURCE1}}
+tar -xf %{SOURCE1}
 cp -p OpenCL-CLHPP-%{cl_hpp_ver}/include/CL/cl2.hpp %{SOURCE2} .
 
 %build
@@ -38,22 +38,26 @@ rm -vf %{buildroot}%{_includedir}/CL/cl_{dx9,d3d}*
 
 %files
 %dir %{_includedir}/CL
-%{_includedir}/CL/opencl.h
-%{_includedir}/CL/cl_platform.h
-%{_includedir}/CL/cl.h
-%{_includedir}/CL/cl_ext.h
+%{_includedir}/CL/cl2.hpp
 %{_includedir}/CL/cl_egl.h
-%{_includedir}/CL/cl_gl.h
-%{_includedir}/CL/cl_gl_ext.h
+%{_includedir}/CL/cl_ext.h
 %{_includedir}/CL/cl_ext_intel.h
+%{_includedir}/CL/cl_gl_ext.h
+%{_includedir}/CL/cl_gl.h
+%{_includedir}/CL/cl.h
+%{_includedir}/CL/cl_half.h
+%{_includedir}/CL/cl.hpp
+%{_includedir}/CL/cl_icd.h
+%{_includedir}/CL/cl_layer.h
+%{_includedir}/CL/cl_platform.h
 %{_includedir}/CL/cl_va_api_media_sharing_intel.h
 %{_includedir}/CL/cl_version.h
-%{_includedir}/CL/cl_icd.h
-%{_includedir}/CL/cl_half.h
-%{_includedir}/CL/cl2.hpp
-%{_includedir}/CL/cl.hpp
+%{_includedir}/CL/opencl.h
 
 %changelog
+* Mon Apr 26 2021 Nicolas Chauvet <kwizart@gmail.com> - 3.0-5.20210426git1d3dc4e
+- Update latest headers
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 04649be..8636dba 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (cl.hpp) = 3168642c970a44eb71c0c05e5cf32441ddfc7a7f7d2c159076cd8cc662dc134773ea6a08b2a9414fcf259e5e9e574054966ad015d1578aae52b87efa5b662ad5
-SHA512 (OpenCL-CLHPP-2.0.12.zip) = a0a51917fea4fb9f1f3a927aac774da29e991559eced41ffc8257d743f8034d6365cb68808784797a123c47390e836bc65fad2effd555b845e14db3b0eedd5f3
-SHA512 (OpenCL-Headers-d65bcc5.tar.gz) = a649768e82ee4fb4861cc6ba9819450bc05c1002036343608dadddd4d34130f01425d99fbaeaa0d30959e64bb3a6019b9d580b0e3c1f4c7849d9d7e67259ac9c
+SHA512 (OpenCL-CLHPP-2.0.13.tar.gz) = 877ef6039e322587b04a61448b1247c32f9c595069e3d6748f11a22016a982a8a6e75a108a1d21c1151315d239b519a50ddc6a0cb2e6c222dac4e39328fdf121
+SHA512 (OpenCL-Headers-1d3dc4e.tar.gz) = 9b1ac77a7b17ecb1b54b4b72f1220ce1b02a58d965012d63d6d76827b9745befdc758c4909abf1acd548008a97009296c26cd2953b11e31c7166e60d678cbb07