diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 5982559..ee69417 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 23 18:02:26 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- move mesa.icd from /usr/etc/OpenCL/vendors to 
+  /usr/share/OpenCL/vendors (boo#1173005)
+
 -------------------------------------------------------------------
 Thu Jun 18 11:02:23 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index b9707ba..0696d28 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -84,9 +84,6 @@
 
 %if 0%{with_opencl}
 %define have_gallium 1
-%if 0%{?suse_version} < 1550
-  %define _distconfdir /etc
-%endif
 %else
 %define have_gallium 0
 %endif
@@ -796,7 +793,7 @@ egl_platforms=x11,drm,surfaceless,wayland
 %endif
 %if 0%{with_opencl}
             -Dgallium-opencl=icd \
-            --sysconfdir=%{_distconfdir} \
+            --sysconfdir=%{_datadir} \
 %endif
             -Ddri-search-path=%{_libdir}/dri \
 %if 0%{with_llvm}
@@ -1175,9 +1172,9 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 
 %if 0%{with_opencl}
 %files -n Mesa-libOpenCL
-%dir %{_distconfdir}/OpenCL
-%dir %{_distconfdir}/OpenCL/vendors
-%{_distconfdir}/OpenCL/vendors/mesa.icd
+%dir %{_datadir}/OpenCL
+%dir %{_datadir}/OpenCL/vendors
+%{_datadir}/OpenCL/vendors/mesa.icd
 %{_libdir}/libMesaOpenCL.so*
 %endif
 
diff --git a/Mesa.changes b/Mesa.changes
index 5982559..ee69417 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 23 18:02:26 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- move mesa.icd from /usr/etc/OpenCL/vendors to 
+  /usr/share/OpenCL/vendors (boo#1173005)
+
 -------------------------------------------------------------------
 Thu Jun 18 11:02:23 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index 8cdb713..321d102 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -83,9 +83,6 @@
 
 %if 0%{with_opencl}
 %define have_gallium 1
-%if 0%{?suse_version} < 1550
-  %define _distconfdir /etc
-%endif
 %else
 %define have_gallium 0
 %endif
@@ -795,7 +792,7 @@ egl_platforms=x11,drm,surfaceless,wayland
 %endif
 %if 0%{with_opencl}
             -Dgallium-opencl=icd \
-            --sysconfdir=%{_distconfdir} \
+            --sysconfdir=%{_datadir} \
 %endif
             -Ddri-search-path=%{_libdir}/dri \
 %if 0%{with_llvm}
@@ -1174,9 +1171,9 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 
 %if 0%{with_opencl}
 %files -n Mesa-libOpenCL
-%dir %{_distconfdir}/OpenCL
-%dir %{_distconfdir}/OpenCL/vendors
-%{_distconfdir}/OpenCL/vendors/mesa.icd
+%dir %{_datadir}/OpenCL
+%dir %{_datadir}/OpenCL/vendors
+%{_datadir}/OpenCL/vendors/mesa.icd
 %{_libdir}/libMesaOpenCL.so*
 %endif