diff --git a/Mesa.changes b/Mesa.changes
index 30058f0..b058b41 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Dec  9 19:15:39 UTC 2015 - mimi.vx@gmail.com
+
+- Update to version 11.0.7
+    + bugfixes release for bugs found since 11.0.6
+      fdo#90348 - Spilling failure of b96 merged value
+      fdo#92363 - [BSW/BDW] ogles1conform Gets test fails
+      fdo#92438 - Segfault in pushbuf_kref when running the android 
+          emulator (qemu) on nv50
+      fdo#93110 - [NVE4] textureSize() and textureQueryLevels() uses a texture 
+          bound during the previous draw call
+      fdo#93126> - wrongly claim supporting GL_EXT_texture_rg
+    + plus fixes for r600g,llvmpipe,i955,egl,gles2
+
+-------------------------------------------------------------------
+Tue Dec  1 07:57:16 UTC 2015 - jimmy@boombatower.com
+
+- Add Mesa-libOpenCL.
+
 -------------------------------------------------------------------
 Sun Nov 22 11:05:34 UTC 2015 - zaitor@opensuse.org
 
diff --git a/Mesa.spec b/Mesa.spec
index 10f3467..ccd1cf1 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -18,7 +18,8 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 11.0.6
+%define _version 11.0.7
+%define with_opencl 0
 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
 %define gallium_loader 1
 %else
@@ -35,9 +36,13 @@
 %endif
 %ifarch %ix86 x86_64
 %define with_nine 1
+%if 0%{gallium_loader} && 0%{?suse_version} > 1310
+# llvm >= 3.7 not provided for <= 13.1
+%define with_opencl 1
+%endif
 %endif
 Name:           Mesa
-Version:        11.0.6
+Version:        11.0.7
 Release:        0
 Summary:        System for rendering interactive 3-D graphics
 License:        MIT
@@ -124,6 +129,11 @@ BuildRequires:  ncurses-devel
 %endif
 #!BuildIgnore:  python
 
+%if 0%{with_opencl}
+BuildRequires:  libclc
+BuildRequires:  llvm-clang-devel
+%endif
+
 %description
 Mesa is a 3-D graphics library with an API which is very similar to
 that of OpenGL.* To the extent that Mesa utilizes the OpenGL command
@@ -510,6 +520,15 @@ Supplements:    xf86-video-ati
 %description -n libvdpau_radeonsi
 This package contains the VDPAU state tracker for radeonsi.
 
+%if 0%{with_opencl}
+%package libOpenCL
+Summary:        Mesa OpenCL implementation
+Group:          System/Libraries
+
+%description libOpenCL
+This package contains the Mesa OpenCL implementation or GalliumCompute.
+%endif
+
 %prep
 %setup -q -n %{_name_archive}-%{_version} -b4
 # remove some docs
@@ -558,7 +577,10 @@ autoreconf -fvi
            --enable-xa \
            --enable-gallium-llvm \
            --with-dri-drivers=i915,i965,nouveau,r200,radeon \
+%if 0%{with_opencl}
+           --enable-opencl \
            --enable-opencl-icd \
+%endif
            --enable-llvm-shared-libs \
            --enable-r600-llvm-compiler \
            --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga \
@@ -694,15 +716,22 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %postun libd3d -p /sbin/ldconfig
 %endif
 
+%if 0%{with_opencl}
+%post   libOpenCL -p /sbin/ldconfig
+
+%postun libOpenCL -p /sbin/ldconfig
+%endif
+
 %files
 %defattr(-,root,root)
 %doc docs/README* docs/COPYING
 %config %{_sysconfdir}/drirc
 %{_libdir}/dri/
-#%if %gallium_loader
-#%dir %_libdir/gallium-pipe/
-#%_libdir/gallium-pipe/pipe_*.so
-#%endif
+%if 0%{with_opencl}
+# only built with opencl
+%dir %{_libdir}/gallium-pipe/
+%{_libdir}/gallium-pipe/pipe_*.so
+%endif
 
 %files -n Mesa-libEGL1
 %defattr(-,root,root)
@@ -879,4 +908,13 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %{_libdir}/d3d/*.so
 %endif
 
+%if 0%{with_opencl}
+%files libOpenCL
+%defattr(-,root,root)
+%dir %{_sysconfdir}/OpenCL
+%dir %{_sysconfdir}/OpenCL/vendors
+%{_sysconfdir}/OpenCL/vendors/mesa.icd
+%{_libdir}/libMesaOpenCL.so*
+%endif
+
 %changelog
diff --git a/baselibs.conf b/baselibs.conf
index e1c1b85..e9cc3e7 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -60,3 +60,4 @@ libvdpau_nouveau
 libvdpau_r300
 libvdpau_r600
 libvdpau_radeonsi
+Mesa-libOpenCL
diff --git a/mesa-11.0.6.tar.xz b/mesa-11.0.6.tar.xz
deleted file mode 100644
index 0d8ac45..0000000
--- a/mesa-11.0.6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760
-size 7272972
diff --git a/mesa-11.0.6.tar.xz.sig b/mesa-11.0.6.tar.xz.sig
deleted file mode 100644
index 61a5bf3..0000000
Binary files a/mesa-11.0.6.tar.xz.sig and /dev/null differ
diff --git a/mesa-11.0.7.tar.xz b/mesa-11.0.7.tar.xz
new file mode 100644
index 0000000..433823a
--- /dev/null
+++ b/mesa-11.0.7.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7e90a332ede6c8fd08eff90786a3fd1605a4e62ebf3a9b514047838194538cb
+size 7279276
diff --git a/mesa-11.0.7.tar.xz.sig b/mesa-11.0.7.tar.xz.sig
new file mode 100644
index 0000000..fbfe6d8
Binary files /dev/null and b/mesa-11.0.7.tar.xz.sig differ