diff --git a/DVD5-i586.group b/DVD5-i586.group
index f01e4a5a..44a0e70d 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -133,6 +133,9 @@
     <package name="apache2-devel"/>
     <package name="apache2-doc"/>
     <package name="apache2-example-pages"/>
+    <package name="apache2-mod_dnssd"/>
+    <package name="apache2-mod_perl"/>
+    <package name="apache2-mod_php7"/>
     <package name="apache2-prefork"/>
     <package name="apache2-utils"/>
     <package name="apparmor-abstractions"/>
@@ -2500,8 +2503,6 @@
     <package name="libnfnetlink0"/>
     <package name="libnfs11"/>
     <package name="libnfsidmap-sss"/>
-    <package name="libnftables0"/>
-    <package name="libnftnl7"/>
     <package name="libnghttp2-14"/>
     <package name="libnice10"/>
     <package name="libnl-config"/>
@@ -3018,7 +3019,7 @@
     <package name="libwx_gtk2u_qa-suse-nostl3_0_4"/>
     <package name="libwx_gtk2u_qa-suse3_0_4"/>
     <package name="libwx_gtk2u_xrc-suse3_0_4"/>
-    <package name="libx86emu1"/>
+    <package name="libx86emu2"/>
     <package name="libxalan-c111"/>
     <package name="libxapian30"/>
     <package name="libxatracker2"/>
@@ -3284,6 +3285,7 @@
     <package name="myspell-pt_BR"/>
     <package name="myspell-ru_RU"/>
     <package name="nagios"/>
+    <package name="nagios-www"/>
     <package name="nano"/>
     <package name="nano-lang"/>
     <package name="nasm"/>
@@ -3315,7 +3317,6 @@
     <package name="nfs-doc"/>
     <package name="nfs-kernel-server"/>
     <package name="nfsidmap"/>
-    <package name="nftables"/>
     <package name="nkf"/>
     <package name="nma-data"/>
     <package name="nmap"/>
@@ -3546,8 +3547,10 @@
     <package name="perl"/>
     <package name="perl-Algorithm-Diff"/>
     <package name="perl-AnyEvent"/>
+    <package name="perl-Apache-AuthCookie"/>
     <package name="perl-Apache-DBI"/>
     <package name="perl-Apache-Session"/>
+    <package name="perl-Apache-SessionX"/>
     <package name="perl-AppConfig"/>
     <package name="perl-Archive-Zip"/>
     <package name="perl-Authen-SASL"/>
@@ -3686,6 +3689,7 @@
     <package name="perl-JSON-XS"/>
     <package name="perl-LWP-MediaTypes"/>
     <package name="perl-LWP-Protocol-https"/>
+    <package name="perl-Linux-Pid"/>
     <package name="perl-List-MoreUtils"/>
     <package name="perl-List-MoreUtils-XS"/>
     <package name="perl-Log-Dispatch"/>
@@ -3782,6 +3786,7 @@
     <package name="perl-Text-Soundex"/>
     <package name="perl-Text-Unidecode"/>
     <package name="perl-Tie-Cache"/>
+    <package name="perl-Tie-IxHash"/>
     <package name="perl-Time-Duration"/>
     <package name="perl-Time-Period"/>
     <package name="perl-Time-modules"/>
@@ -4534,6 +4539,8 @@
     <package name="subversion-bash-completion"/>
     <package name="subversion-doc"/>
     <package name="subversion-perl"/>
+    <package name="subversion-python"/>
+    <package name="subversion-server"/>
     <package name="subversion-tools"/>
     <package name="sudo"/>
     <package name="sunpinyin-data"/>
@@ -4820,6 +4827,7 @@
     <package name="vhba-kmp-default"/>
     <package name="viewnior"/>
     <package name="viewnior-lang"/>
+    <package name="viewvc"/>
     <package name="vim"/>
     <package name="vim-data"/>
     <package name="vim-data-common"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index f49fcee2..5aa7c78a 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -135,6 +135,9 @@
     <package name="apache2-devel"/>
     <package name="apache2-doc"/>
     <package name="apache2-example-pages"/>
+    <package name="apache2-mod_dnssd"/>
+    <package name="apache2-mod_perl"/>
+    <package name="apache2-mod_php7"/>
     <package name="apache2-prefork"/>
     <package name="apache2-utils"/>
     <package name="apparmor-abstractions"/>
@@ -2585,8 +2588,6 @@
     <package name="libnfnetlink0"/>
     <package name="libnfs11"/>
     <package name="libnfsidmap-sss"/>
-    <package name="libnftables0"/>
-    <package name="libnftnl7"/>
     <package name="libnghttp2-14"/>
     <package name="libnice10"/>
     <package name="libnl-config"/>
@@ -3152,7 +3153,7 @@
     <package name="libwx_gtk2u_qa-suse-nostl3_0_4"/>
     <package name="libwx_gtk2u_qa-suse3_0_4"/>
     <package name="libwx_gtk2u_xrc-suse3_0_4"/>
-    <package name="libx86emu1"/>
+    <package name="libx86emu2"/>
     <package name="libxalan-c111"/>
     <package name="libxapian30"/>
     <package name="libxatracker2"/>
@@ -3422,6 +3423,7 @@
     <package name="myspell-pt_BR"/>
     <package name="myspell-ru_RU"/>
     <package name="nagios"/>
+    <package name="nagios-www"/>
     <package name="nano"/>
     <package name="nano-lang"/>
     <package name="nasm"/>
@@ -3453,7 +3455,6 @@
     <package name="nfs-doc"/>
     <package name="nfs-kernel-server"/>
     <package name="nfsidmap"/>
-    <package name="nftables"/>
     <package name="nkf"/>
     <package name="nma-data"/>
     <package name="nmap"/>
@@ -3687,8 +3688,10 @@
     <package name="perl"/>
     <package name="perl-Algorithm-Diff"/>
     <package name="perl-AnyEvent"/>
+    <package name="perl-Apache-AuthCookie"/>
     <package name="perl-Apache-DBI"/>
     <package name="perl-Apache-Session"/>
+    <package name="perl-Apache-SessionX"/>
     <package name="perl-AppConfig"/>
     <package name="perl-Archive-Zip"/>
     <package name="perl-Authen-SASL"/>
@@ -3828,6 +3831,7 @@
     <package name="perl-JSON-XS"/>
     <package name="perl-LWP-MediaTypes"/>
     <package name="perl-LWP-Protocol-https"/>
+    <package name="perl-Linux-Pid"/>
     <package name="perl-List-MoreUtils"/>
     <package name="perl-List-MoreUtils-XS"/>
     <package name="perl-Log-Dispatch"/>
@@ -3924,6 +3928,7 @@
     <package name="perl-Text-Soundex"/>
     <package name="perl-Text-Unidecode"/>
     <package name="perl-Tie-Cache"/>
+    <package name="perl-Tie-IxHash"/>
     <package name="perl-Time-Duration"/>
     <package name="perl-Time-Period"/>
     <package name="perl-Time-modules"/>
@@ -4688,6 +4693,8 @@
     <package name="subversion-bash-completion"/>
     <package name="subversion-doc"/>
     <package name="subversion-perl"/>
+    <package name="subversion-python"/>
+    <package name="subversion-server"/>
     <package name="subversion-tools"/>
     <package name="sudo"/>
     <package name="sunpinyin-data"/>
@@ -4976,6 +4983,7 @@
     <package name="vhba-kmp-default"/>
     <package name="viewnior"/>
     <package name="viewnior-lang"/>
+    <package name="viewvc"/>
     <package name="vim"/>
     <package name="vim-data"/>
     <package name="vim-data-common"/>
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 485f3464..46e3f091 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
@@ -495,7 +495,7 @@
       <repopackage name="libvmtools0"/>
       <repopackage name="libwicked-0-6"/>
       <repopackage name="libwrap0"/>
-      <repopackage name="libx86emu1"/>
+      <repopackage name="libx86emu2"/>
       <repopackage name="libxalan-c111"/>
       <repopackage name="libxerces-c-3_1"/>
       <repopackage name="libxml-security-c17"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 328369b5..89fb5eca 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -130,6 +130,9 @@
       <repopackage name="apache2-devel" arch="i586,i686"/>
       <repopackage name="apache2-doc" arch="i586,i686"/>
       <repopackage name="apache2-example-pages" arch="i586,i686"/>
+      <repopackage name="apache2-mod_dnssd" arch="i586,i686"/>
+      <repopackage name="apache2-mod_perl" arch="i586,i686"/>
+      <repopackage name="apache2-mod_php7" arch="i586,i686"/>
       <repopackage name="apache2-prefork" arch="i586,i686"/>
       <repopackage name="apache2-utils" arch="i586,i686"/>
       <repopackage name="apparmor-abstractions" arch="i586,i686"/>
@@ -2410,8 +2413,6 @@
       <repopackage name="libnfnetlink0" arch="i586,i686"/>
       <repopackage name="libnfs11" arch="i586,i686"/>
       <repopackage name="libnfsidmap-sss" arch="i586,i686"/>
-      <repopackage name="libnftables0" arch="i586,i686"/>
-      <repopackage name="libnftnl7" arch="i586,i686"/>
       <repopackage name="libnghttp2-14" arch="i586,i686"/>
       <repopackage name="libnice10" arch="i586,i686"/>
       <repopackage name="libnl-config" arch="i586,i686"/>
@@ -2985,7 +2986,7 @@
       <repopackage name="libX11-data" arch="i586,i686"/>
       <repopackage name="libX11-devel" arch="i586,i686"/>
       <repopackage name="libX11-xcb1" arch="i586,i686"/>
-      <repopackage name="libx86emu1" arch="i586,i686"/>
+      <repopackage name="libx86emu2" arch="i586,i686"/>
       <repopackage name="libxalan-c111" arch="i586,i686"/>
       <repopackage name="libxapian30" arch="i586,i686"/>
       <repopackage name="libxatracker2" arch="i586,i686"/>
@@ -3311,6 +3312,7 @@
       <repopackage name="myspell-pt_BR" arch="i586,i686"/>
       <repopackage name="myspell-ru_RU" arch="i586,i686"/>
       <repopackage name="nagios" arch="i586,i686"/>
+      <repopackage name="nagios-www" arch="i586,i686"/>
       <repopackage name="nano" arch="i586,i686"/>
       <repopackage name="nano-lang" arch="i586,i686"/>
       <repopackage name="nasm" arch="i586,i686"/>
@@ -3360,7 +3362,6 @@
       <repopackage name="nfs-doc" arch="i586,i686"/>
       <repopackage name="nfs-kernel-server" arch="i586,i686"/>
       <repopackage name="nfsidmap" arch="i586,i686"/>
-      <repopackage name="nftables" arch="i586,i686"/>
       <repopackage name="nkf" arch="i586,i686"/>
       <repopackage name="nma-data" arch="i586,i686"/>
       <repopackage name="nmap" arch="i586,i686"/>
@@ -3601,8 +3602,10 @@
       <repopackage name="perl" arch="i586,i686"/>
       <repopackage name="perl-Algorithm-Diff" arch="i586,i686"/>
       <repopackage name="perl-AnyEvent" arch="i586,i686"/>
+      <repopackage name="perl-Apache-AuthCookie" arch="i586,i686"/>
       <repopackage name="perl-Apache-DBI" arch="i586,i686"/>
       <repopackage name="perl-Apache-Session" arch="i586,i686"/>
+      <repopackage name="perl-Apache-SessionX" arch="i586,i686"/>
       <repopackage name="perl-apparmor" arch="i586,i686"/>
       <repopackage name="perl-AppConfig" arch="i586,i686"/>
       <repopackage name="perl-Archive-Zip" arch="i586,i686"/>
@@ -3748,6 +3751,7 @@
       <repopackage name="perl-libconfigfile" arch="i586,i686"/>
       <repopackage name="perl-libwww-perl" arch="i586,i686"/>
       <repopackage name="perl-libxml-perl" arch="i586,i686"/>
+      <repopackage name="perl-Linux-Pid" arch="i586,i686"/>
       <repopackage name="perl-List-MoreUtils" arch="i586,i686"/>
       <repopackage name="perl-List-MoreUtils-XS" arch="i586,i686"/>
       <repopackage name="perl-Log-Dispatch" arch="i586,i686"/>
@@ -3849,6 +3853,7 @@
       <repopackage name="perl-Text-Soundex" arch="i586,i686"/>
       <repopackage name="perl-Text-Unidecode" arch="i586,i686"/>
       <repopackage name="perl-Tie-Cache" arch="i586,i686"/>
+      <repopackage name="perl-Tie-IxHash" arch="i586,i686"/>
       <repopackage name="perl-Time-Duration" arch="i586,i686"/>
       <repopackage name="perl-Time-modules" arch="i586,i686"/>
       <repopackage name="perl-Time-Period" arch="i586,i686"/>
@@ -4589,6 +4594,8 @@
       <repopackage name="subversion-bash-completion" arch="i586,i686"/>
       <repopackage name="subversion-doc" arch="i586,i686"/>
       <repopackage name="subversion-perl" arch="i586,i686"/>
+      <repopackage name="subversion-python" arch="i586,i686"/>
+      <repopackage name="subversion-server" arch="i586,i686"/>
       <repopackage name="subversion-tools" arch="i586,i686"/>
       <repopackage name="sudo" arch="i586,i686"/>
       <repopackage name="sunpinyin-data" arch="i586,i686"/>
@@ -4876,6 +4883,7 @@
       <repopackage name="vhba-kmp-default" arch="i586,i686"/>
       <repopackage name="viewnior" arch="i586,i686"/>
       <repopackage name="viewnior-lang" arch="i586,i686"/>
+      <repopackage name="viewvc" arch="i586,i686"/>
       <repopackage name="vim" arch="i586,i686"/>
       <repopackage name="vim-data" arch="i586,i686"/>
       <repopackage name="vim-data-common" arch="i586,i686"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index 141f4297..d174fa4f 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -135,6 +135,9 @@
       <repopackage name="apache2-devel" arch="x86_64"/>
       <repopackage name="apache2-doc" arch="x86_64"/>
       <repopackage name="apache2-example-pages" arch="x86_64"/>
+      <repopackage name="apache2-mod_dnssd" arch="x86_64"/>
+      <repopackage name="apache2-mod_perl" arch="x86_64"/>
+      <repopackage name="apache2-mod_php7" arch="x86_64"/>
       <repopackage name="apache2-prefork" arch="x86_64"/>
       <repopackage name="apache2-utils" arch="x86_64"/>
       <repopackage name="apparmor-abstractions" arch="x86_64"/>
@@ -2478,8 +2481,6 @@
       <repopackage name="libnfnetlink0" arch="x86_64"/>
       <repopackage name="libnfs11" arch="x86_64"/>
       <repopackage name="libnfsidmap-sss" arch="x86_64"/>
-      <repopackage name="libnftables0" arch="x86_64"/>
-      <repopackage name="libnftnl7" arch="x86_64"/>
       <repopackage name="libnghttp2-14" arch="x86_64"/>
       <repopackage name="libnice10" arch="x86_64"/>
       <repopackage name="libnl-config" arch="x86_64"/>
@@ -3104,7 +3105,7 @@
       <repopackage name="libX11-data" arch="x86_64"/>
       <repopackage name="libX11-devel" arch="x86_64"/>
       <repopackage name="libX11-xcb1" arch="x86_64"/>
-      <repopackage name="libx86emu1" arch="x86_64"/>
+      <repopackage name="libx86emu2" arch="x86_64"/>
       <repopackage name="libxalan-c111" arch="x86_64"/>
       <repopackage name="libxapian30" arch="x86_64"/>
       <repopackage name="libxatracker2" arch="x86_64"/>
@@ -3447,6 +3448,7 @@
       <repopackage name="myspell-pt_BR" arch="x86_64"/>
       <repopackage name="myspell-ru_RU" arch="x86_64"/>
       <repopackage name="nagios" arch="x86_64"/>
+      <repopackage name="nagios-www" arch="x86_64"/>
       <repopackage name="nano" arch="x86_64"/>
       <repopackage name="nano-lang" arch="x86_64"/>
       <repopackage name="nasm" arch="x86_64"/>
@@ -3496,7 +3498,6 @@
       <repopackage name="nfs-doc" arch="x86_64"/>
       <repopackage name="nfs-kernel-server" arch="x86_64"/>
       <repopackage name="nfsidmap" arch="x86_64"/>
-      <repopackage name="nftables" arch="x86_64"/>
       <repopackage name="nkf" arch="x86_64"/>
       <repopackage name="nma-data" arch="x86_64"/>
       <repopackage name="nmap" arch="x86_64"/>
@@ -3740,8 +3741,10 @@
       <repopackage name="perl" arch="x86_64"/>
       <repopackage name="perl-Algorithm-Diff" arch="x86_64"/>
       <repopackage name="perl-AnyEvent" arch="x86_64"/>
+      <repopackage name="perl-Apache-AuthCookie" arch="x86_64"/>
       <repopackage name="perl-Apache-DBI" arch="x86_64"/>
       <repopackage name="perl-Apache-Session" arch="x86_64"/>
+      <repopackage name="perl-Apache-SessionX" arch="x86_64"/>
       <repopackage name="perl-apparmor" arch="x86_64"/>
       <repopackage name="perl-AppConfig" arch="x86_64"/>
       <repopackage name="perl-Archive-Zip" arch="x86_64"/>
@@ -3888,6 +3891,7 @@
       <repopackage name="perl-libconfigfile" arch="x86_64"/>
       <repopackage name="perl-libwww-perl" arch="x86_64"/>
       <repopackage name="perl-libxml-perl" arch="x86_64"/>
+      <repopackage name="perl-Linux-Pid" arch="x86_64"/>
       <repopackage name="perl-List-MoreUtils" arch="x86_64"/>
       <repopackage name="perl-List-MoreUtils-XS" arch="x86_64"/>
       <repopackage name="perl-Log-Dispatch" arch="x86_64"/>
@@ -3989,6 +3993,7 @@
       <repopackage name="perl-Text-Soundex" arch="x86_64"/>
       <repopackage name="perl-Text-Unidecode" arch="x86_64"/>
       <repopackage name="perl-Tie-Cache" arch="x86_64"/>
+      <repopackage name="perl-Tie-IxHash" arch="x86_64"/>
       <repopackage name="perl-Time-Duration" arch="x86_64"/>
       <repopackage name="perl-Time-modules" arch="x86_64"/>
       <repopackage name="perl-Time-Period" arch="x86_64"/>
@@ -4741,6 +4746,8 @@
       <repopackage name="subversion-bash-completion" arch="x86_64"/>
       <repopackage name="subversion-doc" arch="x86_64"/>
       <repopackage name="subversion-perl" arch="x86_64"/>
+      <repopackage name="subversion-python" arch="x86_64"/>
+      <repopackage name="subversion-server" arch="x86_64"/>
       <repopackage name="subversion-tools" arch="x86_64"/>
       <repopackage name="sudo" arch="x86_64"/>
       <repopackage name="sunpinyin-data" arch="x86_64"/>
@@ -5030,6 +5037,7 @@
       <repopackage name="vhba-kmp-default" arch="x86_64"/>
       <repopackage name="viewnior" arch="x86_64"/>
       <repopackage name="viewnior-lang" arch="x86_64"/>
+      <repopackage name="viewvc" arch="x86_64"/>
       <repopackage name="vim" arch="x86_64"/>
       <repopackage name="vim-data" arch="x86_64"/>
       <repopackage name="vim-data-common" arch="x86_64"/>
diff --git a/openSUSE-Kubic.group b/openSUSE-Kubic.group
index ec58845f..3604d8b4 100644
--- a/openSUSE-Kubic.group
+++ b/openSUSE-Kubic.group
@@ -287,7 +287,7 @@
     <package name="libverto1"/>
     <package name="libwicked-0-6"/>
     <package name="libwrap0"/>
-    <package name="libx86emu1"/>
+    <package name="libx86emu2"/>
     <package name="libxml2-2"/>
     <package name="libxml2-tools"/>
     <package name="libxtables12"/>