diff --git a/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
index 30dfd9a2..557802e6 100644
--- a/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Tumbleweed-Kubic___20180605" schemaversion="4.1">
+<image name="OBS__openSUSE-Tumbleweed-Kubic___20180606" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,9 +35,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180605</productvar>
+      <productvar name="VERSION">20180606</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180605,openSUSE Tumbleweed Kubic</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180606,openSUSE Tumbleweed Kubic</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec b/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec
index b75c3fd1..3a7de205 100644
--- a/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec
+++ b/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec
@@ -17,7 +17,7 @@
 
 
 Name:           openSUSE-Tumbleweed-Kubic-release
-Version:        20180605
+Version:        20180606
 Release:        0
 Summary:        openSUSE Tumbleweed Kubic 
 License:        GPL-2.0-or-later
@@ -38,9 +38,9 @@ Provides:       openSUSE-Kubic-release
 ExclusiveArch:  %ix86 x86_64 ppc64le s390x aarch64
 Provides:       %name-%version
 Provides:       product() = openSUSE-Tumbleweed-Kubic
-Provides:       product(openSUSE-Tumbleweed-Kubic) = 20180605-0
+Provides:       product(openSUSE-Tumbleweed-Kubic) = 20180606-0
 Provides:       product-label() = openSUSE%20Tumbleweed%20Kubic
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20180605
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20180606
 Provides:       product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
 Provides:       product-endoflife()
 Requires:       product_flavor(openSUSE-Tumbleweed-Kubic)
@@ -61,7 +61,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
-Provides:       product_flavor(openSUSE-Tumbleweed-Kubic) = 20180605-0
+Provides:       product_flavor(openSUSE-Tumbleweed-Kubic) = 20180606-0
 Summary:        openSUSE Tumbleweed Kubic
 
 %description dvd
@@ -85,9 +85,9 @@ openSUSE Tumbleweed Kubic combines the benefits of a rolling
 
 %install
 mkdir -p %{buildroot}%{_sysconfdir}
-mkdir -p %{buildroot}%{_prefix}/lib/issue.d
-echo -e "\nWelcome to openSUSE Tumbleweed Kubic (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_prefix}/lib/issue.d/10-OS
-echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-OS
+mkdir -p %{buildroot}%{_libexecdir}/issue.d
+echo -e "\nWelcome to openSUSE Tumbleweed Kubic (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_libexecdir}/issue.d/10-OS
+echo -e "\n" > %{buildroot}%{_libexecdir}/issue.d/90-OS
 
 touch %{buildroot}%{_sysconfdir}/motd
 
@@ -96,14 +96,14 @@ mkdir -p %{buildroot}/%{_sysconfdir}/YaST2/licenses/base
 cd %{buildroot}/%{_sysconfdir}/YaST2/licenses/base
 if [ -f /CD1/license.tar.gz ]; then
   tar -xzf /CD1/license.tar.gz
-elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then
-  tar -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz
+elif [ -f %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then
+  tar -xzf %{_libexecdir}/skelcd/CD1/license.tar.gz
 fi
 
 VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
 # note: VERSION is an optional field and has no meaning other than informative on a rolling distro
 # We do thus not add it to the os-release file
-cat > %{buildroot}%{_prefix}/lib/os-release <<EOF
+cat > %{buildroot}%{_libexecdir}/os-release <<EOF
 NAME="openSUSE Tumbleweed Kubic"
 # VERSION="%{version}%{?betaversion: %{betaversion}}"
 ID="opensuse-tumbleweed-kubic"
@@ -115,7 +115,7 @@ CPE_NAME="cpe:/o:opensuse:tumbleweed-kubic:%{version}"
 BUG_REPORT_URL="https://bugs.opensuse.org"
 HOME_URL="https://www.opensuse.org/"
 EOF
-ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release
+ln -s ..%{_libexecdir}/os-release %{buildroot}%{_sysconfdir}/os-release
 
 mkdir -p $RPM_BUILD_ROOT/etc/products.d
 cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Tumbleweed-Kubic.prod << EOF
@@ -123,11 +123,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Tumbleweed-Kubic.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE-Tumbleweed-Kubic</name>
-  <version>20180605</version>
+  <version>20180606</version>
   <release>0</release>
   <endoflife></endoflife>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180605</cpeid>
+  <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180606</cpeid>
   <productline>openSUSE-Tumbleweed-Kubic</productline>
   <register>
     <pool>
@@ -179,7 +179,7 @@ EOF
 %files
 %defattr(644,root,root,755)
 %{_sysconfdir}/os-release
-%{_prefix}/lib/os-release
+%{_libexecdir}/os-release
 %dir %{_sysconfdir}/products.d
 %{_sysconfdir}/products.d/*
 %dir %{_sysconfdir}/YaST2/
@@ -189,7 +189,7 @@ EOF
 # no %doc here, or we will not install them
 %{_sysconfdir}/YaST2/licenses/base/license*txt
 %{_sysconfdir}/YaST2/licenses/base/no-acceptance-needed
-%dir %{_prefix}/lib/issue.d
-%{_prefix}/lib/issue.d/*-OS
+%dir %{_libexecdir}/issue.d
+%{_libexecdir}/issue.d/*-OS
 
 %changelog
diff --git a/_service:product_converter:openSUSE-cd-mini-i586.kiwi b/_service:product_converter:openSUSE-cd-mini-i586.kiwi
index 50d0ee5d..81c62215 100644
--- a/_service:product_converter:openSUSE-cd-mini-i586.kiwi
+++ b/_service:product_converter:openSUSE-cd-mini-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20180605" schemaversion="4.1">
+<image name="OBS__openSUSE___20180606" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -32,9 +32,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180605</productvar>
+      <productvar name="VERSION">20180606</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180605,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180606,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/_service:product_converter:openSUSE-cd-mini-x86_64.kiwi b/_service:product_converter:openSUSE-cd-mini-x86_64.kiwi
index 2d532374..db4a6913 100644
--- a/_service:product_converter:openSUSE-cd-mini-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-cd-mini-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20180605" schemaversion="4.1">
+<image name="OBS__openSUSE___20180606" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,9 +35,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180605</productvar>
+      <productvar name="VERSION">20180606</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180605,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180606,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 6cc1347b..cf6499ee 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20180605" schemaversion="4.1">
+<image name="OBS__openSUSE___20180606" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -32,9 +32,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180605</productvar>
+      <productvar name="VERSION">20180606</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180605,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180606,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index 3f8d6ffc..b01a31a8 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20180605" schemaversion="4.1">
+<image name="OBS__openSUSE___20180606" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,9 +35,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180605</productvar>
+      <productvar name="VERSION">20180606</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180605,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180606,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi b/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
index 5de92ca3..36642f8f 100644
--- a/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
+++ b/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20180605" schemaversion="4.1">
+<image name="OBS__openSUSE___20180606" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -24,7 +24,7 @@
       <productvar name="DISTNAME">openSUSE</productvar>
       <productvar name="FLAVOR">ftp</productvar>
       <productvar name="MAKE_LISTINGS">true</productvar>
-      <productvar name="MEDIUM_NAME">openSUSE-20180605-i586-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-20180606-i586-x86_64</productvar>
       <productvar name="MULTIPLE_MEDIA">true</productvar>
       <productvar name="PRODUCT_DIR">/</productvar>
       <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,9 +36,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180605</productvar>
+      <productvar name="VERSION">20180606</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180605,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180606,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="DEBUGMEDIUM">2</productoption>
diff --git a/_service:product_converter:openSUSE-release.spec b/_service:product_converter:openSUSE-release.spec
index 07c8ba12..6e99caba 100644
--- a/_service:product_converter:openSUSE-release.spec
+++ b/_service:product_converter:openSUSE-release.spec
@@ -20,7 +20,7 @@
 #define betaversion %{nil}
 %define codename Tumbleweed
 Name:           openSUSE-release
-Version:        20180605
+Version:        20180606
 Release:        0
 # 0 is the product release, not the build release of this package
 Summary:        openSUSE Tumbleweed
@@ -42,16 +42,16 @@ Conflicts:      core-release <= 10
 Conflicts:      distribution-release
 Conflicts:      sled-release <= 10
 Conflicts:      sles-release <= 10
-# Give zypp a hint that this product must be kept up-to-date using zypper dup, not up (boo#1061384)
 Provides:       aaa_version
 Provides:       distribution-release
 Provides:       suse-release = %{version}-%{release}
 Provides:       suse-release-oss = %{version}-%{release}
+# Give zypp a hint that this product must be kept up-to-date using zypper dup, not up (boo#1061384)
 Provides:       product-update() = dup
 Obsoletes:      aaa_version
 Obsoletes:      openSUSE-Promo-release <= 11.1
 Obsoletes:      openSUSE-release-live <= 11.0
-Obsoletes:      product_flavor(%{product}) < 20180605
+Obsoletes:      product_flavor(%{product}) < 20180606
 # bnc#826592
 Provides:       weakremover(kernel-default) < 3.11
 Provides:       weakremover(kernel-desktop) < 4.2
@@ -61,7 +61,7 @@ Provides:       weakremover(kernel-vanilla) < 3.11
 Provides:       weakremover(kernel-xen) < 3.11
 Provides:       %name-%version
 Provides:       product() = openSUSE
-Provides:       product(openSUSE) = 20180605-0
+Provides:       product(openSUSE) = 20180606-0
 %ifarch x86_64
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
 %endif
@@ -75,7 +75,7 @@ Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dppc64le
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Daarch64
 %endif
 Provides:       product-label() = openSUSE
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20180605
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20180606
 Provides:       product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
 Provides:       product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
 Requires:       product_flavor(openSUSE)
@@ -17113,7 +17113,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(ftp)
-Provides:       product_flavor(openSUSE) = 20180605-0
+Provides:       product_flavor(openSUSE) = 20180606-0
 Summary:        openSUSE Tumbleweed
 
 %description ftp
@@ -17128,7 +17128,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(mini)
-Provides:       product_flavor(openSUSE) = 20180605-0
+Provides:       product_flavor(openSUSE) = 20180606-0
 Summary:        openSUSE Tumbleweed
 
 %description mini
@@ -17143,7 +17143,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
-Provides:       product_flavor(openSUSE) = 20180605-0
+Provides:       product_flavor(openSUSE) = 20180606-0
 Summary:        openSUSE Tumbleweed
 
 %description dvd
@@ -17158,7 +17158,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-kde)
-Provides:       product_flavor(openSUSE) = 20180605-0
+Provides:       product_flavor(openSUSE) = 20180606-0
 Summary:        openSUSE Tumbleweed
 
 %description livecd-kde
@@ -17173,7 +17173,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-x11)
-Provides:       product_flavor(openSUSE) = 20180605-0
+Provides:       product_flavor(openSUSE) = 20180606-0
 Summary:        openSUSE Tumbleweed
 
 %description livecd-x11
@@ -17188,7 +17188,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-gnome)
-Provides:       product_flavor(openSUSE) = 20180605-0
+Provides:       product_flavor(openSUSE) = 20180606-0
 Summary:        openSUSE Tumbleweed
 
 %description livecd-gnome
@@ -17203,7 +17203,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-kde)
-Provides:       product_flavor(openSUSE) = 20180605-0
+Provides:       product_flavor(openSUSE) = 20180606-0
 Summary:        openSUSE Tumbleweed
 
 %description usb-kde
@@ -17218,7 +17218,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-gnome)
-Provides:       product_flavor(openSUSE) = 20180605-0
+Provides:       product_flavor(openSUSE) = 20180606-0
 Summary:        openSUSE Tumbleweed
 
 %description usb-gnome
@@ -17233,7 +17233,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-x11)
-Provides:       product_flavor(openSUSE) = 20180605-0
+Provides:       product_flavor(openSUSE) = 20180606-0
 Summary:        openSUSE Tumbleweed
 
 %description usb-x11
@@ -17250,23 +17250,23 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
 mkdir license
 if [ -f /CD1/license.tar.gz ]; then
   tar -C license -xzf /CD1/license.tar.gz
-elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then
-  tar -C license -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz
+elif [ -f %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then
+  tar -C license -xzf %{_libexecdir}/skelcd/CD1/license.tar.gz
 fi
 
 %build
 
 %install
-mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_prefix}/lib/issue.d %{buildroot}/run
+mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_libexecdir}/issue.d %{buildroot}/run
 
-echo -e 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel \\r (\\l).\n' > %{buildroot}%{_prefix}/lib/issue.d/10-openSUSE.conf
-echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-openSUSE.conf
+echo -e 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel \\r (\\l).\n' > %{buildroot}%{_libexecdir}/issue.d/10-openSUSE.conf
+echo -e "\n" > %{buildroot}%{_libexecdir}/issue.d/90-openSUSE.conf
 echo    'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel %%r (%%t).' > %{buildroot}%{_sysconfdir}/issue.net
 
 VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
 # note: VERSION is an optional field and has no meaning other than informative on a rolling distro
 # We do thus not add it to the os-release file
-cat > %{buildroot}%{_prefix}/lib/os-release <<EOF
+cat > %{buildroot}%{_libexecdir}/os-release <<EOF
 NAME="openSUSE Tumbleweed"
 # VERSION="%{version}%{?betaversion: %{betaversion}}"
 ID="opensuse-tumbleweed"
@@ -17278,7 +17278,7 @@ CPE_NAME="cpe:/o:opensuse:tumbleweed:%{version}"
 BUG_REPORT_URL="https://bugs.opensuse.org"
 HOME_URL="https://www.opensuse.org/"
 EOF
-ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release
+ln -s ..%{_libexecdir}/os-release %{buildroot}%{_sysconfdir}/os-release
 
 echo "Have a lot of fun..." > %{buildroot}%{_sysconfdir}/motd
 # Bug 404141 - /etc/YaST/control.xml should be owned by some package
@@ -17286,8 +17286,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/YaST2/
 echo %{buildroot}
 if [ -f /CD1/control.xml ]; then
   install -m 644 /CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
-elif [ -f %{_prefix}/lib/skelcd/CD1/control.xml ]; then
-  install -m 644 %{_prefix}/lib/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
+elif [ -f %{_libexecdir}/skelcd/CD1/control.xml ]; then
+  install -m 644 %{_libexecdir}/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
 fi
 
 # fate#319341, make openSUSE-release own YaST license files. TODO:
@@ -17306,10 +17306,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE</name>
-  <version>20180605</version>
+  <version>20180606</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse:20180605</cpeid>
+  <cpeid>cpe:/o:opensuse:opensuse:20180606</cpeid>
   <productline>openSUSE</productline>
   <register>
     <pool>
@@ -34479,14 +34479,14 @@ fi
 %{_sysconfdir}/YaST2/licenses/base
 %license license/*
 %{_sysconfdir}/os-release
-%{_prefix}/lib/os-release
+%{_libexecdir}/os-release
 # Bug 404141 - /etc/YaST/control.xml should be owned by some package
 %dir %{_sysconfdir}/YaST2/
 %config %{_sysconfdir}/YaST2/control.xml
 %config(noreplace) %{_sysconfdir}/motd
-%dir %{_prefix}/lib/issue.d/
-%{_prefix}/lib/issue.d/10-openSUSE.conf
-%{_prefix}/lib/issue.d/90-openSUSE.conf
+%dir %{_libexecdir}/issue.d/
+%{_libexecdir}/issue.d/10-openSUSE.conf
+%{_libexecdir}/issue.d/90-openSUSE.conf
 %config(noreplace) %{_sysconfdir}/issue.net
 %{_sysconfdir}/products.d
 
diff --git a/openSUSE-Tumbleweed-Kubic-release.spec b/openSUSE-Tumbleweed-Kubic-release.spec
index be16bead..4cf95066 100644
--- a/openSUSE-Tumbleweed-Kubic-release.spec
+++ b/openSUSE-Tumbleweed-Kubic-release.spec
@@ -50,9 +50,9 @@ ___FLAVOR_PACKAGES___
 
 %install
 mkdir -p %{buildroot}%{_sysconfdir}
-mkdir -p %{buildroot}%{_prefix}/lib/issue.d
-echo -e "\nWelcome to ___SUMMARY___ (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_prefix}/lib/issue.d/10-OS
-echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-OS
+mkdir -p %{buildroot}%{_libexecdir}/issue.d
+echo -e "\nWelcome to ___SUMMARY___ (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_libexecdir}/issue.d/10-OS
+echo -e "\n" > %{buildroot}%{_libexecdir}/issue.d/90-OS
 
 touch %{buildroot}%{_sysconfdir}/motd
 
@@ -61,14 +61,14 @@ mkdir -p %{buildroot}/%{_sysconfdir}/YaST2/licenses/base
 cd %{buildroot}/%{_sysconfdir}/YaST2/licenses/base
 if [ -f /CD1/license.tar.gz ]; then
   tar -xzf /CD1/license.tar.gz
-elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then
-  tar -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz
+elif [ -f %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then
+  tar -xzf %{_libexecdir}/skelcd/CD1/license.tar.gz
 fi
 
 VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
 # note: VERSION is an optional field and has no meaning other than informative on a rolling distro
 # We do thus not add it to the os-release file
-cat > %{buildroot}%{_prefix}/lib/os-release <<EOF
+cat > %{buildroot}%{_libexecdir}/os-release <<EOF
 NAME="openSUSE Tumbleweed Kubic"
 # VERSION="%{version}%{?betaversion: %{betaversion}}"
 ID="opensuse-tumbleweed-kubic"
@@ -80,14 +80,14 @@ CPE_NAME="cpe:/o:opensuse:tumbleweed-kubic:%{version}"
 BUG_REPORT_URL="https://bugs.opensuse.org"
 HOME_URL="https://www.opensuse.org/"
 EOF
-ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release
+ln -s ..%{_libexecdir}/os-release %{buildroot}%{_sysconfdir}/os-release
 
 ___CREATE_PRODUCT_FILES___
 
 %files
 %defattr(644,root,root,755)
 %{_sysconfdir}/os-release
-%{_prefix}/lib/os-release
+%{_libexecdir}/os-release
 %dir %{_sysconfdir}/products.d
 %{_sysconfdir}/products.d/*
 %dir %{_sysconfdir}/YaST2/
@@ -97,7 +97,7 @@ ___CREATE_PRODUCT_FILES___
 # no %doc here, or we will not install them
 %{_sysconfdir}/YaST2/licenses/base/license*txt
 %{_sysconfdir}/YaST2/licenses/base/no-acceptance-needed
-%dir %{_prefix}/lib/issue.d
-%{_prefix}/lib/issue.d/*-OS
+%dir %{_libexecdir}/issue.d
+%{_libexecdir}/issue.d/*-OS
 
 %changelog
diff --git a/openSUSE-Tumbleweed-Kubic.product b/openSUSE-Tumbleweed-Kubic.product
index 9fcb70cd..34d9f920 100644
--- a/openSUSE-Tumbleweed-Kubic.product
+++ b/openSUSE-Tumbleweed-Kubic.product
@@ -6,7 +6,7 @@
       <name>openSUSE-Tumbleweed-Kubic</name>
       <releasepkgname>openSUSE-Tumbleweed-Kubic-release</releasepkgname>
       <endoflife/>
-      <version>20180605</version>
+      <version>20180606</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>openSUSE-Tumbleweed-Kubic</productline>
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index 502fe332..8e58fb62 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -42,11 +42,11 @@ Conflicts:      core-release <= 10
 Conflicts:      distribution-release
 Conflicts:      sled-release <= 10
 Conflicts:      sles-release <= 10
-# Give zypp a hint that this product must be kept up-to-date using zypper dup, not up (boo#1061384)
 Provides:       aaa_version
 Provides:       distribution-release
 Provides:       suse-release = %{version}-%{release}
 Provides:       suse-release-oss = %{version}-%{release}
+# Give zypp a hint that this product must be kept up-to-date using zypper dup, not up (boo#1061384)
 Provides:       product-update() = dup
 Obsoletes:      aaa_version
 Obsoletes:      openSUSE-Promo-release <= 11.1
@@ -72,23 +72,23 @@ ___FLAVOR_PACKAGES___
 mkdir license
 if [ -f /CD1/license.tar.gz ]; then
   tar -C license -xzf /CD1/license.tar.gz
-elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then
-  tar -C license -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz
+elif [ -f %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then
+  tar -C license -xzf %{_libexecdir}/skelcd/CD1/license.tar.gz
 fi
 
 %build
 
 %install
-mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_prefix}/lib/issue.d %{buildroot}/run
+mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_libexecdir}/issue.d %{buildroot}/run
 
-echo -e 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel \\r (\\l).\n' > %{buildroot}%{_prefix}/lib/issue.d/10-openSUSE.conf
-echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-openSUSE.conf
+echo -e 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel \\r (\\l).\n' > %{buildroot}%{_libexecdir}/issue.d/10-openSUSE.conf
+echo -e "\n" > %{buildroot}%{_libexecdir}/issue.d/90-openSUSE.conf
 echo    'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel %%r (%%t).' > %{buildroot}%{_sysconfdir}/issue.net
 
 VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
 # note: VERSION is an optional field and has no meaning other than informative on a rolling distro
 # We do thus not add it to the os-release file
-cat > %{buildroot}%{_prefix}/lib/os-release <<EOF
+cat > %{buildroot}%{_libexecdir}/os-release <<EOF
 NAME="openSUSE Tumbleweed"
 # VERSION="%{version}%{?betaversion: %{betaversion}}"
 ID="opensuse-tumbleweed"
@@ -100,7 +100,7 @@ CPE_NAME="cpe:/o:opensuse:tumbleweed:%{version}"
 BUG_REPORT_URL="https://bugs.opensuse.org"
 HOME_URL="https://www.opensuse.org/"
 EOF
-ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release
+ln -s ..%{_libexecdir}/os-release %{buildroot}%{_sysconfdir}/os-release
 
 echo "Have a lot of fun..." > %{buildroot}%{_sysconfdir}/motd
 # Bug 404141 - /etc/YaST/control.xml should be owned by some package
@@ -108,8 +108,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/YaST2/
 echo %{buildroot}
 if [ -f /CD1/control.xml ]; then
   install -m 644 /CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
-elif [ -f %{_prefix}/lib/skelcd/CD1/control.xml ]; then
-  install -m 644 %{_prefix}/lib/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
+elif [ -f %{_libexecdir}/skelcd/CD1/control.xml ]; then
+  install -m 644 %{_libexecdir}/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
 fi
 
 # fate#319341, make openSUSE-release own YaST license files. TODO:
@@ -156,14 +156,14 @@ fi
 %{_sysconfdir}/YaST2/licenses/base
 %license license/*
 %{_sysconfdir}/os-release
-%{_prefix}/lib/os-release
+%{_libexecdir}/os-release
 # Bug 404141 - /etc/YaST/control.xml should be owned by some package
 %dir %{_sysconfdir}/YaST2/
 %config %{_sysconfdir}/YaST2/control.xml
 %config(noreplace) %{_sysconfdir}/motd
-%dir %{_prefix}/lib/issue.d/
-%{_prefix}/lib/issue.d/10-openSUSE.conf
-%{_prefix}/lib/issue.d/90-openSUSE.conf
+%dir %{_libexecdir}/issue.d/
+%{_libexecdir}/issue.d/10-openSUSE.conf
+%{_libexecdir}/issue.d/90-openSUSE.conf
 %config(noreplace) %{_sysconfdir}/issue.net
 %{_sysconfdir}/products.d
 
diff --git a/openSUSE.product b/openSUSE.product
index 10e7063e..881cb31a 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -4,7 +4,7 @@
     <product>
 	<vendor>openSUSE</vendor>
         <name>openSUSE</name>
-        <version>20180605</version>
+        <version>20180606</version>
         <release>0</release>
 
         <productline>openSUSE</productline>