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