diff --git a/dvd.group b/dvd.group
index bdde11ac..024dd704 100644
--- a/dvd.group
+++ b/dvd.group
@@ -1178,6 +1178,7 @@
     <package name="kdoctools-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="kdump" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="kernel-default" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="kernel-default-devel" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="kernel-devel" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="kernel-docs" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="kernel-firmware-all" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -5550,6 +5551,7 @@
     <package name="drbd-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="drbd-utils" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="efibootmgr" supportstatus="unsupported"/> <!-- reason: dvd:grub2-x86_64-efi -->
+    <package name="fipscheck" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="fprintd-pam-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="gdk-pixbuf-query-loaders-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="glibc-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -5564,7 +5566,7 @@
     <package name="gtk2-tools-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="guestfs-data" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ibus-gtk-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="kernel-default-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="kernel-syms" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="kmozillahelper" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="krb5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="ldmtool" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5617,6 +5619,7 @@
     <package name="libexpat1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libfam0-gamin-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libffi7-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="libfipscheck1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="libfontconfig1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libfreetype6-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libfribidi0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5723,7 +5726,7 @@
     <package name="libz1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="mcelog" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="mokutil" supportstatus="unsupported"/> <!-- reason: dvd:mokutil -->
-    <package name="mozilla-nss-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
+    <package name="mozilla-nss-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="nodejs12" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="nodejs12-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="npm12" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5738,6 +5741,8 @@
     <package name="pam_ssh-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <!-- patterns-media-rest_dvd uninstallable: nothing provides pattern() = apparmor_opt needed by patterns-media-rest_dvd-20170319-23.3.x86_64-->
     <package name="patterns-server-xen_server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-xen_server -->
+    <package name="pesign" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
+    <package name="pesign-obs-integration" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="plasma-browser-integration" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="plasma-browser-integration-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="pmdk" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 7b9c299a..3de9854c 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -1185,6 +1185,7 @@
       <repopackage name="kdoctools-lang"/>
       <repopackage name="kdump"/>
       <repopackage name="kernel-default"/>
+      <repopackage name="kernel-default-devel"/>
       <repopackage name="kernel-devel"/>
       <repopackage name="kernel-docs"/>
       <repopackage name="kernel-firmware-all"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 427bd073..8558d96d 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -560,6 +560,7 @@
       <repopackage name="fillup"/>
       <repopackage name="findutils"/>
       <repopackage name="findutils-lang"/>
+      <repopackage name="fipscheck" arch="x86_64"/>
       <repopackage name="firebird"/>
       <repopackage name="firewalld"/>
       <repopackage name="firewalld-lang"/>
@@ -1213,7 +1214,7 @@
       <repopackage name="kdoctools-lang"/>
       <repopackage name="kdump"/>
       <repopackage name="kernel-default"/>
-      <repopackage name="kernel-default-devel" arch="x86_64"/>
+      <repopackage name="kernel-default-devel"/>
       <repopackage name="kernel-devel"/>
       <repopackage name="kernel-docs"/>
       <repopackage name="kernel-firmware-all"/>
@@ -1248,6 +1249,7 @@
       <repopackage name="kernel-firmware-usb-network"/>
       <repopackage name="kernel-macros"/>
       <repopackage name="kernel-source"/>
+      <repopackage name="kernel-syms" arch="x86_64"/>
       <repopackage name="kexec-tools"/>
       <repopackage name="keyutils"/>
       <repopackage name="kf5-kcm-fcitx"/>
@@ -1794,6 +1796,7 @@
       <repopackage name="libfftw3_threads3"/>
       <repopackage name="libfile1_0"/>
       <repopackage name="libfind4_0"/>
+      <repopackage name="libfipscheck1" arch="x86_64"/>
       <repopackage name="libfl-devel"/>
       <repopackage name="libfl2"/>
       <repopackage name="libFLAC++6"/>
@@ -4006,6 +4009,8 @@
       <repopackage name="permissions"/>
       <repopackage name="permissions-config"/>
       <repopackage name="permissions-doc"/>
+      <repopackage name="pesign" arch="x86_64"/>
+      <repopackage name="pesign-obs-integration" arch="x86_64"/>
       <repopackage name="pfscalibration"/>
       <repopackage name="pfstmo"/>
       <repopackage name="pfstools"/>
diff --git a/unsorted.yml b/unsorted.yml
index 9d8a29cd..0f68fc91 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -3031,7 +3031,7 @@ unsorted:
   - finger-server 
   - fio 
   - fips 
-  - fipscheck 
+  - fipscheck: [i586] 
   - fipscheck-devel 
   - firebird-doc 
   - firebird-examples 
@@ -6412,7 +6412,6 @@ unsorted:
   - kernel-debug-devel 
   - kernel-default-base: [i586] 
   - kernel-default-base-rebuild 
-  - kernel-default-devel: [i586] # devel package of dvd:kernel-default 
   - kernel-docs-html 
   - kernel-firmware 
   - kernel-kvmsmall: [x86_64] 
@@ -6422,7 +6421,7 @@ unsorted:
   - kernel-pae: [i586] 
   - kernel-pae-devel: [i586] 
   - kernel-source-vanilla 
-  - kernel-syms 
+  - kernel-syms: [i586] 
   - kernel-vanilla 
   - kernel-vanilla-devel 
   - ketchup 
@@ -8893,7 +8892,7 @@ unsorted:
   - libfinal-devel 
   - libfinal-examples 
   - libfinal0 
-  - libfipscheck1 
+  - libfipscheck1: [i586] 
   - libfipscheck1-32bit: [x86_64] 
   - libfishsound-devel 
   - libfishsound1 
@@ -11372,6 +11371,7 @@ unsorted:
   - libretro-crocods 
   - libretro-database 
   - libretro-desmume 
+  - libretro-dolphin: [x86_64] 
   - libretro-dosbox 
   - libretro-easyrpg 
   - libretro-fceumm 
@@ -17037,8 +17037,8 @@ unsorted:
   - permissions-zypp-plugin 
   - permlib-devel 
   - perseus-sdr-tools 
-  - pesign 
-  - pesign-obs-integration 
+  - pesign: [i586] 
+  - pesign-obs-integration: [i586] 
   - petsc-devel 
   - petsc-doc 
   - petsc-gnu-mpich-hpc-devel 
@@ -34222,7 +34222,7 @@ unsorted:
   - zathura-lang 
   - zathura-plugin-cb 
   - zathura-plugin-djvu 
-  - zathura-plugin-pdf-mupdf: [i586] 
+  - zathura-plugin-pdf-mupdf 
   - zathura-plugin-pdf-poppler 
   - zathura-plugin-ps 
   - zathura-zsh-completion