diff --git a/srcpkgs/opencl-headers/template b/srcpkgs/opencl-headers/template
index 7e0b848f83..285f48228c 100644
--- a/srcpkgs/opencl-headers/template
+++ b/srcpkgs/opencl-headers/template
@@ -3,14 +3,39 @@ pkgname=opencl-headers
 _openclver=1.2
 _distver=20121114
 version=${_openclver}.${_distver}
-revision=2
+revision=3
 noarch="yes"
 short_desc="OpenCL (Open Computing Language) header files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
 homepage="http://www.khronos.org/registry/cl/"
-distfiles="http://xbps.nopcode.org/distfiles/${pkgname}-${version}.tar.xz"
-checksum="a51c39e625a58865f43fecd7c42050e0c5b8d0523530ca6c8e61adbc8ba6b3ce"
+distfiles="https://www.khronos.org/registry/cl/api/1.2/cl.h
+ https://www.khronos.org/registry/cl/api/1.2/cl.hpp
+ https://www.khronos.org/registry/cl/api/1.2/cl_d3d10.h
+ https://www.khronos.org/registry/cl/api/1.2/cl_d3d11.h
+ https://www.khronos.org/registry/cl/api/1.2/cl_dx9_media_sharing.h
+ https://www.khronos.org/registry/cl/api/1.2/cl_egl.h
+ https://www.khronos.org/registry/cl/api/1.2/cl_ext.h
+ https://www.khronos.org/registry/cl/api/1.2/cl_gl.h
+ https://www.khronos.org/registry/cl/api/1.2/cl_gl_ext.h
+ https://www.khronos.org/registry/cl/api/1.2/cl_platform.h
+ https://www.khronos.org/registry/cl/api/1.2/opencl.h"
+checksum="ee0bde19ac49607855d3f5025c6932ccbeed420291dfb9080690a4cfa0c12901
+ a726d674bfa4ee7f71d1287d86afa15db2e360518fd58594257a80f25642d6b4
+ 55b90d14c388f1b8b93e04a549fa3a25c74f7476ffa15a71e17322bc365b4363
+ ab036bbcb6ee11aad3038d33c485a9bcf2a15eb6eb83b9a4a9bd72fb98ce3360
+ 774bede18a9f26827c4c05a1ee591a5c607f4ef153ad799c47efdb44727d256c
+ 31e046f50c34b24ddb9dd2a9eb182c854703c862c5e10f0145175567d6b6e670
+ 23b4a6227b3ac59c72518d9abe05b56e427b2f302ec24dec32023b9ef5fb33d0
+ 0b53a3b04bbcd6c122acc0fe9ccdacf80d521a64bb29c02cddad60a4ea447bf8
+ 4d663bbfc932ab405623e5f5d1bba3f438351d0ead65e1ccdd9bb769caf7a7d0
+ f196eb389a5030e67d176157081f09ab7ab97dcfdd94345ee8d2055496fa24b8
+ be1bf717e103678292d6718b3608c9e54a48588c02d3d387a48656fac46ec8d9"
+replaces="opencl2-headers>=0"
+
+do_extract() {
+        cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/* $wrksrc
+}
 
 do_install() {
 	vmkdir usr/include/CL
diff --git a/srcpkgs/opencl2-headers/template b/srcpkgs/opencl2-headers/template
new file mode 100644
index 0000000000..b2eef2d52d
--- /dev/null
+++ b/srcpkgs/opencl2-headers/template
@@ -0,0 +1,42 @@
+# Template file for 'opencl2-headers'
+pkgname=opencl2-headers
+_openclver=2.0
+_distver=20140412
+version=${_openclver}.${_distver}
+revision=1
+noarch="yes"
+short_desc="OpenCL 2.0 (Open Computing Language) header files"
+maintainer="John Galt <johngaltfirstrun@gmail.com"
+license="MIT"
+homepage="http://www.khronos.org/registry/cl/"
+provides="opencl-headers-${version}_${revision}"
+replaces="opencl-headers>=0"
+distfiles="https://www.khronos.org/registry/cl/api/2.0/cl.h
+ https://www.khronos.org/registry/cl/api/2.0/cl_d3d10.h
+ https://www.khronos.org/registry/cl/api/2.0/cl_d3d11.h
+ https://www.khronos.org/registry/cl/api/2.0/cl_dx9_media_sharing.h
+ https://www.khronos.org/registry/cl/api/2.0/cl_egl.h
+ https://www.khronos.org/registry/cl/api/2.0/cl_ext.h
+ https://www.khronos.org/registry/cl/api/2.0/cl_gl.h
+ https://www.khronos.org/registry/cl/api/2.0/cl_gl_ext.h
+ https://www.khronos.org/registry/cl/api/2.0/cl_platform.h
+ https://www.khronos.org/registry/cl/api/2.0/opencl.h"
+checksum="5c39e93d4492cd3005ae806a91b7dd3cad28f4e69036208be21e37f8a4395717
+ 14b00ef68a2d7f471c7ef5b4576bc103888da70fc525b263b49ff7fff150e188
+ 707709a73b6b43b96c55e813efb2d655efcc82eb103da4b8aea191231df7e1fd
+ 41968538b82523ef8fb642a1a4da20a6262ce0448f71541db080f8ccc03971b6
+ 31e046f50c34b24ddb9dd2a9eb182c854703c862c5e10f0145175567d6b6e670
+ be1ff04c63b678383828ab1e69ecf3bec54eec4cf4ae33e210b4a16eff47d809
+ 40375d991f4e847c94ad56c6c14400e3e7d72620117b49636518a96d57f30647
+ dccb3b45e53bfe0219bb48e6dbe9591bbe6a090a8b0d93a3b8580f526abc4616
+ 042877b8091bfeeb489018505ce36c37cd3295e691856461b1c0a8fbb6b2cc21
+ fceb7e76d81159caab6308a05ff05d18fbd84718eff4263473ecd148c458987c"
+
+do_extract() {
+	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/* $wrksrc
+}
+
+do_install() {
+	vmkdir usr/include/CL
+	install -m644 *.h ${DESTDIR}/usr/include/CL
+}