diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,29 +1,18 @@
 name       : opencl-headers
-version    : 2.2
-release    : 1
+version    : 2020.12.18
+release    : 2
 source     :
-    - git|https://github.com/KhronosGroup/OpenCL-Headers : f039db6764d52388658ef15c30b2237bbda49803
-    - https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v2.0.10.tar.gz : fa27456295c3fa534ce824eb0314190a8b3ebd3ba4d93a0b1270fc65bf378f2b
-license    : MIT
-component  : programming
-summary    : OpenCL (Open Computing Language) header files
+    - https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v2020.12.18.tar.gz : 5dad6d436c0d7646ef62a39ef6cd1f3eba0a98fc9157808dfc1d808f3705ebc2
+license    : Apache-2.0
+component  : programming.devel
+homepage   : https://github.com/KhronosGroup/OpenCL-Headers/
+summary    : OpenCL C header files
 description: |
-    OpenCL (Open Computing Language) header files
+    OpenCL (Open Computing Language) header files for the C programming language.
 patterns   :
- - /*
-setup      : |
-    # Get rid of Direct3D stuffs
-    rm -vf opencl22/CL/{cl_d3d,cl_dx9}*.h
-
-    tar xf $sources/v2.0.10.tar.gz
-build      : |
-    cd OpenCL-CLHPP-*
-
-    python gen_cl_hpp.py -i input_cl.hpp -o cl.hpp
-    mv input_cl2.hpp cl2.hpp
+    - /usr/include/CL/*
 install    : |
-    install -D -m00644 opencl22/CL/*.h -t $installdir/usr/include/CL
-
-    cd OpenCL-CLHPP-*
-    install -m00644 cl{,2}.hpp -t $installdir/usr/include/CL
+    # Get rid of Direct3D stuffs
+    rm -vf CL/{cl_d3d,cl_dx9}*.h
 
+    install -Dm00644 CL/*.h -t $installdir/usr/include/CL
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -1,34 +1,46 @@
 <PISI>
     <Source>
         <Name>opencl-headers</Name>
+        <Homepage>https://github.com/KhronosGroup/OpenCL-Headers/</Homepage>
         <Packager>
-            <Name>Pierre-Yves</Name>
-            <Email>pyu@riseup.net</Email>
+            <Name>Campbell Jones</Name>
+            <Email>dev@serebit.com</Email>
         </Packager>
-        <License>MIT</License>
-        <PartOf>programming</PartOf>
-        <Summary xml:lang="en">OpenCL (Open Computing Language) header files</Summary>
-        <Description xml:lang="en">OpenCL (Open Computing Language) header files
+        <License>Apache-2.0</License>
+        <PartOf>programming.devel</PartOf>
+        <Summary xml:lang="en">OpenCL C header files</Summary>
+        <Description xml:lang="en">OpenCL (Open Computing Language) header files for the C programming language.
 </Description>
-        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>opencl-headers</Name>
-        <Summary xml:lang="en">OpenCL (Open Computing Language) header files</Summary>
-        <Description xml:lang="en">OpenCL (Open Computing Language) header files
+        <Summary xml:lang="en">OpenCL C header files</Summary>
+        <Description xml:lang="en">OpenCL (Open Computing Language) header files for the C programming language.
 </Description>
-        <PartOf>programming</PartOf>
+        <PartOf>programming.devel</PartOf>
         <Files>
-            <Path fileType="data">/*</Path>
+            <Path fileType="header">/usr/include/CL/cl.h</Path>
+            <Path fileType="header">/usr/include/CL/cl_egl.h</Path>
+            <Path fileType="header">/usr/include/CL/cl_ext.h</Path>
+            <Path fileType="header">/usr/include/CL/cl_ext_intel.h</Path>
+            <Path fileType="header">/usr/include/CL/cl_gl.h</Path>
+            <Path fileType="header">/usr/include/CL/cl_gl_ext.h</Path>
+            <Path fileType="header">/usr/include/CL/cl_half.h</Path>
+            <Path fileType="header">/usr/include/CL/cl_icd.h</Path>
+            <Path fileType="header">/usr/include/CL/cl_platform.h</Path>
+            <Path fileType="header">/usr/include/CL/cl_va_api_media_sharing_intel.h</Path>
+            <Path fileType="header">/usr/include/CL/cl_version.h</Path>
+            <Path fileType="header">/usr/include/CL/opencl.h</Path>
         </Files>
     </Package>
     <History>
-        <Update release="1">
-            <Date>2018-02-13</Date>
-            <Version>2.2</Version>
+        <Update release="2">
+            <Date>2021-03-22</Date>
+            <Version>2020.12.18</Version>
             <Comment>Packaging update</Comment>
-            <Name>Pierre-Yves</Name>
-            <Email>pyu@riseup.net</Email>
+            <Name>Campbell Jones</Name>
+            <Email>dev@serebit.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file