diff --git a/.gitignore b/.gitignore
index b26ef76..eb4ca68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /cl2.hpp
 /cl.hpp
 /opencl-headers-8e196ba.tar.gz
+/OpenCL-Headers-e986688.tar.gz
diff --git a/opencl-headers.spec b/opencl-headers.spec
index 728c9a1..b28b89a 100644
--- a/opencl-headers.spec
+++ b/opencl-headers.spec
@@ -1,19 +1,20 @@
-%global commit 8e196ba99632fc43998cf17cce87282c250d9177
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit0 e986688daf750633898dfd3994e14a9e618f2aa5
+%global date 20180306
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cl_hpp_ver 2.0.10
 
 Name:           opencl-headers
-Version:        2.1
-Release:        4%{?dist}
+Version:        2.2
+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/%{commit}/%{name}-%{shortcommit}.tar.gz
+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
 # OCL 1.2 compatibility
-Source2:        https://www.khronos.org/registry/cl/api/%{version}/cl.hpp
+Source2:        https://www.khronos.org/registry/cl/api/2.1/cl.hpp
 
 BuildArch:      noarch
 
@@ -21,17 +22,18 @@ BuildArch:      noarch
 %{summary}.
 
 %prep
-%autosetup -n OpenCL-Headers-%{commit}
+%autosetup -n OpenCL-Headers-%{commit0}
+
 cp -p %{SOURCE1} %{SOURCE2} .
-# We're not interested in Direct3D things
-rm -vf cl_dx9_media_sharing.h cl_d3d10.h cl_d3d11.h
 
 %build
 # Nothing to build
 
 %install
 mkdir -p %{buildroot}%{_includedir}/CL/
-install -p -m 0644 * -t %{buildroot}%{_includedir}/CL/
+install -p -m 0644 *hpp opencl22/CL/* -t %{buildroot}%{_includedir}/CL/
+# We're not interested in Direct3D things
+rm -vf %{buildroot}%{_includedir}/CL/cl_{dx9,d3d}*
 
 %files
 %dir %{_includedir}/CL
@@ -42,10 +44,16 @@ install -p -m 0644 * -t %{buildroot}%{_includedir}/CL/
 %{_includedir}/CL/cl_egl.h
 %{_includedir}/CL/cl_gl.h
 %{_includedir}/CL/cl_gl_ext.h
+%{_includedir}/CL/cl_ext_intel.h
+%{_includedir}/CL/cl_va_api_media_sharing_intel.h
 %{_includedir}/CL/cl2.hpp
 %{_includedir}/CL/cl.hpp
 
 %changelog
+* Fri Mar 23 2018 Simone Caronni <negativo17@gmail.com> - 2.2-1.20180306gite986688
+- Update to 2.2.
+- Use packaging guidelines for snapshots.
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 1a920b3..da620cd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-c38d1b78cd98cc809fa2a49dbd1734a5  cl2.hpp
-f2c8bee05e5a84ea8282b7b95646c515  cl.hpp
-831892cf05da6d8b2d9a62899c732759  opencl-headers-8e196ba.tar.gz
+SHA512 (OpenCL-Headers-e986688.tar.gz) = b21631d7d7afc064c02607b45af572bd51bf0b6f7a5df11edad97843e01a684d55339917e0dbdeb17263e90ca2da4202cbfebe6e4946964a0d727e9e5ede9ae2
+SHA512 (cl2.hpp) = f220e3dd013596fe3134bf43e2957c293186071460f2a03f6e81e0e7def3213a568d4b29a06b4921cd3488e8626200dcd4693808f0f6c8f88e67d4147ff474e8
+SHA512 (cl.hpp) = 3168642c970a44eb71c0c05e5cf32441ddfc7a7f7d2c159076cd8cc662dc134773ea6a08b2a9414fcf259e5e9e574054966ad015d1578aae52b87efa5b662ad5