diff --git a/opencl-headers/PKGBUILD b/opencl-headers/PKGBUILD
index a6bcf376c..2e761062e 100644
--- a/opencl-headers/PKGBUILD
+++ b/opencl-headers/PKGBUILD
@@ -1,54 +1,35 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
-
 pkgname=opencl-headers
-pkgver=2.0.20150827
-_clbasever=2.0
+pkgver=2.2.20170516
 pkgrel=1
 pkgdesc='OpenCL (Open Computing Language) header files'
 arch=('any')
-url='http://www.khronos.org/registry/cl/'
+url='https://www.khronos.org/registry/cl/'
 license=('custom')
-source=("https://sources.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.src.tar.xz"
+source=('git+https://github.com/KhronosGroup/OpenCL-Headers.git#commit=ec2566b'
+        'git+https://github.com/KhronosGroup/OpenCL-CLHPP.git#commit=e250e2e'
         'LICENSE.txt')
-_headers=("http://www.khronos.org/registry/cl/api/${_clbasever}/cl_ext.h"
-          "http://www.khronos.org/registry/cl/api/${_clbasever}/cl_egl.h"
-          "http://www.khronos.org/registry/cl/api/${_clbasever}/cl_gl_ext.h"
-          "http://www.khronos.org/registry/cl/api/${_clbasever}/cl_gl.h"
-          "http://www.khronos.org/registry/cl/api/${_clbasever}/cl.h"
-          "http://www.khronos.org/registry/cl/api/1.2/cl.hpp"
-          "http://www.khronos.org/registry/cl/api/${_clbasever}/cl2.hpp"
-          "http://www.khronos.org/registry/cl/api/${_clbasever}/cl_platform.h"
-          "http://www.khronos.org/registry/cl/api/${_clbasever}/opencl.h")
-sha1sums=('5889c9dda903b09e69f8bfbbdd623b01f1c4e8aa'
+sha1sums=('SKIP'
+          'SKIP'
           '98abb35b2eca82d0fc19db6d28fcc7bd20be0655')
 
-# source PKGBUILD && mksource
-mksource() {
-   cd "${srcdir}"
-   _dirname=${pkgname}-${pkgver}
-   mkdir ${_dirname}
-
-   pushd ${_dirname}
-   for _h in ${_headers[@]}; do
-      wget ${_h}
-   done
-   popd
-
-   tar -cJv --exclude=CVS -f ${_dirname}.src.tar.xz ${_dirname}
-   rm -rf ${_dirname}
-}
-
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"/OpenCL-Headers/opencl22/CL
 
-   install -dm755 "${pkgdir}"/usr/include/CL
+  install -dm755 "${pkgdir}"/usr/include/CL
 
-   for h in $(ls -1 *.h *.hpp); do
-      install -m 644 ${h} "${pkgdir}"/usr/include/CL/
-   done
+  for h in *.h; do
+    install -m 644 ${h} "${pkgdir}"/usr/include/CL/
+  done
 
-   install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  # remove useless headers
+  rm "${pkgdir}"/usr/include/CL/{cl_d3d,cl_dx9}*.h
+
+  cd "${srcdir}"/OpenCL-CLHPP
+
+  python gen_cl_hpp.py -i input_cl.hpp -o cl.hpp
+  install -m 644 cl.hpp "${pkgdir}"/usr/include/CL/
+  install -m 644 input_cl2.hpp "${pkgdir}"/usr/include/CL/cl2.hpp
+
+  install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
+