diff --git a/dvd.group b/dvd.group
index 1799a4a6..3037dc6d 100644
--- a/dvd.group
+++ b/dvd.group
@@ -2286,6 +2286,7 @@
     <package name="libimobiledevice6" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libindicator3-7" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libini_config5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="libinput-udev" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libinput10" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libipmiconsole2" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libipmidetect0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5585,7 +5586,6 @@
   <conditional name="only_i586"/>
   <packagelist relationship="recommends">
     <package name="elinks" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libinput-udev" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libpng12-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
   </packagelist>
 </group>
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 757e7c3d..3e76f915 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -2017,7 +2017,7 @@
       <repopackage name="libimobiledevice6"/>
       <repopackage name="libindicator3-7"/>
       <repopackage name="libini_config5"/>
-      <repopackage name="libinput-udev" arch="i586,i686"/>
+      <repopackage name="libinput-udev"/>
       <repopackage name="libinput10"/>
       <repopackage name="libipmiconsole2"/>
       <repopackage name="libipmidetect0"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 2bb12222..2cb4fb80 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -2117,6 +2117,7 @@
       <repopackage name="libimobiledevice6"/>
       <repopackage name="libindicator3-7"/>
       <repopackage name="libini_config5"/>
+      <repopackage name="libinput-udev"/>
       <repopackage name="libinput10"/>
       <repopackage name="libipmiconsole2"/>
       <repopackage name="libipmidetect0"/>
diff --git a/unsorted.yml b/unsorted.yml
index 58e2f42e..df3be54c 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -471,6 +471,10 @@ unsorted:
   - apache-commons-digester-javadoc 
   - apache-commons-email 
   - apache-commons-email-javadoc 
+  - apache-commons-exec 
+  - apache-commons-exec-javadoc 
+  - apache-commons-fileupload 
+  - apache-commons-fileupload-javadoc 
   - apache-commons-httpclient 
   - apache-commons-httpclient-demo 
   - apache-commons-httpclient-javadoc 
@@ -2459,6 +2463,8 @@ unsorted:
   - exa: [x86_64] 
   - exaile 
   - exaile-lang 
+  - exec-maven-plugin 
+  - exec-maven-plugin-javadoc 
   - execstack 
   - exempi-tools 
   - exercism 
@@ -5343,9 +5349,12 @@ unsorted:
   - java-libkolabxml1 
   - java-mraa 
   - javacc 
+  - javacc-bootstrap 
   - javacc-demo 
   - javacc-javadoc 
   - javacc-manual 
+  - javacc-maven-plugin 
+  - javacc-maven-plugin-javadoc 
   - javadoc 
   - javahelp2 
   - javahelp2-javadoc 
@@ -7353,7 +7362,7 @@ unsorted:
   - libcelt-devel-32bit: [x86_64] 
   - libcelt0-2-32bit: [x86_64] 
   - libcelt051-0 
-  - libcephfs-devel: [x86_64] # devel package of dvd:librbd1 
+  - libcephfs-devel: [x86_64] # devel package of dvd:librados2 
   - libceres-devel 
   - libceres1 
   - libcerf-devel 
@@ -8664,7 +8673,7 @@ unsorted:
   - libiniparser1-32bit: [x86_64] 
   - libinjeqt1 
   - libinotifytools0 
-  - libinput-devel: [i586] # devel package of dvd:libinput-udev 
+  - libinput-devel 
   - libinput-tools 
   - libinput10-32bit: [x86_64] 
   - libinstpatch-1_0-0 
@@ -10128,15 +10137,15 @@ unsorted:
   - libqxt1 
   - libqxtglobalshortcut0 
   - libradcli4 
-  - librados-devel: [x86_64] # devel package of dvd:librbd1 
-  - libradospp-devel: [x86_64] # devel package of dvd:librbd1 
-  - libradosstriper-devel: [x86_64] # devel package of dvd:librbd1 
+  - librados-devel: [x86_64] # devel package of dvd:librados2 
+  - libradospp-devel: [x86_64] # devel package of dvd:librados2 
+  - libradosstriper-devel: [x86_64] # devel package of dvd:librados2 
   - libragel0 
   - libraptor-devel 
   - libraptor2-0-32bit: [x86_64] 
-  - libraqm-devel: [i586] 
-  - libraqm-doc: [i586] 
-  - libraqm0: [i586] 
+  - libraqm-devel 
+  - libraqm-doc 
+  - libraqm0 
   - librasqal-devel 
   - librasqal-devel-doc 
   - librasqal3-32bit: [x86_64] 
@@ -10152,7 +10161,7 @@ unsorted:
   - librawstudio-2_1 
   - librawstudio-devel 
   - libraylib2 
-  - librbd-devel: [x86_64] # devel package of dvd:librbd1 
+  - librbd-devel: [x86_64] # devel package of dvd:librados2 
   - librbio2 
   - librbl1 
   - librcc-devel 
@@ -10330,7 +10339,7 @@ unsorted:
   - librevenge-doc 
   - librevenge-generators-0_0-0 
   - librfxencode0 
-  - librgw-devel: [x86_64] # devel package of dvd:librbd1 
+  - librgw-devel: [x86_64] # devel package of dvd:librados2 
   - librhash0 
   - librime-devel 
   - librime1 
@@ -12031,12 +12040,20 @@ unsorted:
   - matthewlib-java 
   - matthewlib-java-javadoc 
   - maven 
+  - maven-ant-plugin 
+  - maven-ant-plugin-javadoc 
+  - maven-antrun-plugin 
+  - maven-antrun-plugin-javadoc 
   - maven-archiver 
   - maven-archiver-javadoc 
   - maven-artifact 
   - maven-artifact-manager 
   - maven-artifact-transfer 
   - maven-artifact-transfer-javadoc 
+  - maven-assembly-plugin 
+  - maven-assembly-plugin-javadoc 
+  - maven-clean-plugin 
+  - maven-clean-plugin-javadoc 
   - maven-common-artifact-filters 
   - maven-common-artifact-filters-javadoc 
   - maven-compiler-plugin 
@@ -12072,6 +12089,8 @@ unsorted:
   - maven-filtering-javadoc 
   - maven-invoker 
   - maven-invoker-javadoc 
+  - maven-invoker-plugin 
+  - maven-invoker-plugin-javadoc 
   - maven-jar-plugin 
   - maven-jar-plugin-bootstrap 
   - maven-jar-plugin-javadoc 
@@ -12085,6 +12104,8 @@ unsorted:
   - maven-monitor 
   - maven-parent 
   - maven-plugin-annotations 
+  - maven-plugin-bundle 
+  - maven-plugin-bundle-javadoc 
   - maven-plugin-descriptor 
   - maven-plugin-plugin 
   - maven-plugin-plugin-bootstrap 
@@ -20981,7 +21002,7 @@ unsorted:
   - radeontop-lang 
   - radiotray 
   - radiotray-lang 
-  - rados-objclass-devel: [x86_64] # devel package of dvd:librbd1 
+  - rados-objclass-devel: [x86_64] # devel package of dvd:librados2 
   - rage 
   - ragel 
   - ragel-6