diff --git a/DVD5-i586.group b/DVD5-i586.group
index fd0ee9b0..ccac68a4 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -16,6 +16,7 @@
     <package name="Mesa"/>
     <package name="Mesa-dri"/>
     <package name="Mesa-dri-devel"/>
+    <package name="Mesa-dri-nouveau"/>
     <package name="Mesa-gallium"/>
     <package name="Mesa-libEGL-devel"/>
     <package name="Mesa-libEGL1"/>
@@ -373,12 +374,6 @@
     <package name="canna-libs"/>
     <package name="cantarell-fonts"/>
     <package name="capi4hylafax"/>
-    <package name="caribou"/>
-    <package name="caribou-common"/>
-    <package name="caribou-gtk-module-common"/>
-    <package name="caribou-gtk2-module"/>
-    <package name="caribou-gtk3-module"/>
-    <package name="caribou-lang"/>
     <package name="ccache"/>
     <package name="cd-discid"/>
     <package name="cdparanoia"/>
@@ -2182,7 +2177,6 @@
     <package name="libcap2"/>
     <package name="libcapi20-3"/>
     <package name="libcares2"/>
-    <package name="libcaribou0"/>
     <package name="libccolamd-2_9_6"/>
     <package name="libcdda_interface0"/>
     <package name="libcdda_paranoia0"/>
@@ -3388,6 +3382,7 @@
     <package name="libvamp-hostsdk3"/>
     <package name="libvdeplug3"/>
     <package name="libvdpau1"/>
+    <package name="libvdpau_nouveau"/>
     <package name="libvdpau_r300"/>
     <package name="libvdpau_r600"/>
     <package name="libvdpau_radeonsi"/>
@@ -5074,7 +5069,6 @@
     <package name="typelib-1_0-AppIndicator3-0_1"/>
     <package name="typelib-1_0-Atk-1_0"/>
     <package name="typelib-1_0-Atspi-2_0"/>
-    <package name="typelib-1_0-Caribou-1_0"/>
     <package name="typelib-1_0-Champlain-0_12"/>
     <package name="typelib-1_0-Clutter-1_0"/>
     <package name="typelib-1_0-ClutterGst-3_0"/>
@@ -5315,6 +5309,7 @@
     <package name="xf86-video-mach64"/>
     <package name="xf86-video-mga"/>
     <package name="xf86-video-neomagic"/>
+    <package name="xf86-video-nouveau"/>
     <package name="xf86-video-nv"/>
     <package name="xf86-video-qxl"/>
     <package name="xf86-video-r128"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index d4a02ece..4e0d5d93 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -16,6 +16,7 @@
     <package name="Mesa"/>
     <package name="Mesa-dri"/>
     <package name="Mesa-dri-devel"/>
+    <package name="Mesa-dri-nouveau"/>
     <package name="Mesa-gallium"/>
     <package name="Mesa-libEGL-devel"/>
     <package name="Mesa-libEGL1"/>
@@ -377,12 +378,6 @@
     <package name="canna-libs"/>
     <package name="cantarell-fonts"/>
     <package name="capi4hylafax"/>
-    <package name="caribou"/>
-    <package name="caribou-common"/>
-    <package name="caribou-gtk-module-common"/>
-    <package name="caribou-gtk2-module"/>
-    <package name="caribou-gtk3-module"/>
-    <package name="caribou-lang"/>
     <package name="ccache"/>
     <package name="cd-discid"/>
     <package name="cdparanoia"/>
@@ -2209,7 +2204,6 @@
     <package name="libcap2-32bit"/>
     <package name="libcapi20-3"/>
     <package name="libcares2"/>
-    <package name="libcaribou0"/>
     <package name="libccolamd-2_9_6"/>
     <package name="libcdda_interface0"/>
     <package name="libcdda_paranoia0"/>
@@ -3511,6 +3505,7 @@
     <package name="libvamp-hostsdk3"/>
     <package name="libvdeplug3"/>
     <package name="libvdpau1"/>
+    <package name="libvdpau_nouveau"/>
     <package name="libvdpau_r300"/>
     <package name="libvdpau_r600"/>
     <package name="libvdpau_radeonsi"/>
@@ -5230,7 +5225,6 @@
     <package name="typelib-1_0-AppIndicator3-0_1"/>
     <package name="typelib-1_0-Atk-1_0"/>
     <package name="typelib-1_0-Atspi-2_0"/>
-    <package name="typelib-1_0-Caribou-1_0"/>
     <package name="typelib-1_0-Champlain-0_12"/>
     <package name="typelib-1_0-Clutter-1_0"/>
     <package name="typelib-1_0-ClutterGst-3_0"/>
@@ -5474,6 +5468,7 @@
     <package name="xf86-video-mach64"/>
     <package name="xf86-video-mga"/>
     <package name="xf86-video-neomagic"/>
+    <package name="xf86-video-nouveau"/>
     <package name="xf86-video-nv"/>
     <package name="xf86-video-qxl"/>
     <package name="xf86-video-r128"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 9ac3ddcf..6f3a9c27 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -365,12 +365,6 @@
       <repopackage name="canna-libs" arch="i586,i686"/>
       <repopackage name="cantarell-fonts" arch="i586,i686"/>
       <repopackage name="capi4hylafax" arch="i586,i686"/>
-      <repopackage name="caribou" arch="i586,i686"/>
-      <repopackage name="caribou-common" arch="i586,i686"/>
-      <repopackage name="caribou-gtk-module-common" arch="i586,i686"/>
-      <repopackage name="caribou-gtk2-module" arch="i586,i686"/>
-      <repopackage name="caribou-gtk3-module" arch="i586,i686"/>
-      <repopackage name="caribou-lang" arch="i586,i686"/>
       <repopackage name="ccache" arch="i586,i686"/>
       <repopackage name="cd-discid" arch="i586,i686"/>
       <repopackage name="cdparanoia" arch="i586,i686"/>
@@ -1870,7 +1864,6 @@
       <repopackage name="libcap2" arch="i586,i686"/>
       <repopackage name="libcapi20-3" arch="i586,i686"/>
       <repopackage name="libcares2" arch="i586,i686"/>
-      <repopackage name="libcaribou0" arch="i586,i686"/>
       <repopackage name="libccolamd-2_9_6" arch="i586,i686"/>
       <repopackage name="libcdda_interface0" arch="i586,i686"/>
       <repopackage name="libcdda_paranoia0" arch="i586,i686"/>
@@ -3342,6 +3335,7 @@
       <repopackage name="libvamp-hostsdk3" arch="i586,i686"/>
       <repopackage name="libvdeplug3" arch="i586,i686"/>
       <repopackage name="libvdpau1" arch="i586,i686"/>
+      <repopackage name="libvdpau_nouveau" arch="i586,i686"/>
       <repopackage name="libvdpau_r300" arch="i586,i686"/>
       <repopackage name="libvdpau_r600" arch="i586,i686"/>
       <repopackage name="libvdpau_radeonsi" arch="i586,i686"/>
@@ -3714,6 +3708,7 @@
       <repopackage name="Mesa" arch="i586,i686"/>
       <repopackage name="Mesa-dri" arch="i586,i686"/>
       <repopackage name="Mesa-dri-devel" arch="i586,i686"/>
+      <repopackage name="Mesa-dri-nouveau" arch="i586,i686"/>
       <repopackage name="Mesa-gallium" arch="i586,i686"/>
       <repopackage name="Mesa-libEGL-devel" arch="i586,i686"/>
       <repopackage name="Mesa-libEGL1" arch="i586,i686"/>
@@ -5130,7 +5125,6 @@
       <repopackage name="typelib-1_0-AppIndicator3-0_1" arch="i586,i686"/>
       <repopackage name="typelib-1_0-Atk-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-Atspi-2_0" arch="i586,i686"/>
-      <repopackage name="typelib-1_0-Caribou-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-Champlain-0_12" arch="i586,i686"/>
       <repopackage name="typelib-1_0-Clutter-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-ClutterGst-3_0" arch="i586,i686"/>
@@ -5374,6 +5368,7 @@
       <repopackage name="xf86-video-mach64" arch="i586,i686"/>
       <repopackage name="xf86-video-mga" arch="i586,i686"/>
       <repopackage name="xf86-video-neomagic" arch="i586,i686"/>
+      <repopackage name="xf86-video-nouveau" arch="i586,i686"/>
       <repopackage name="xf86-video-nv" arch="i586,i686"/>
       <repopackage name="xf86-video-qxl" arch="i586,i686"/>
       <repopackage name="xf86-video-r128" 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 f3f28235..e77752a6 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -372,12 +372,6 @@
       <repopackage name="canna-libs" arch="x86_64"/>
       <repopackage name="cantarell-fonts" arch="x86_64"/>
       <repopackage name="capi4hylafax" arch="x86_64"/>
-      <repopackage name="caribou" arch="x86_64"/>
-      <repopackage name="caribou-common" arch="x86_64"/>
-      <repopackage name="caribou-gtk-module-common" arch="x86_64"/>
-      <repopackage name="caribou-gtk2-module" arch="x86_64"/>
-      <repopackage name="caribou-gtk3-module" arch="x86_64"/>
-      <repopackage name="caribou-lang" arch="x86_64"/>
       <repopackage name="ccache" arch="x86_64"/>
       <repopackage name="cd-discid" arch="x86_64"/>
       <repopackage name="cdparanoia" arch="x86_64"/>
@@ -1878,7 +1872,6 @@
       <repopackage name="libcap2-32bit" arch="x86_64"/>
       <repopackage name="libcapi20-3" arch="x86_64"/>
       <repopackage name="libcares2" arch="x86_64"/>
-      <repopackage name="libcaribou0" arch="x86_64"/>
       <repopackage name="libccolamd-2_9_6" arch="x86_64"/>
       <repopackage name="libcdda_interface0" arch="x86_64"/>
       <repopackage name="libcdda_paranoia0" arch="x86_64"/>
@@ -3449,6 +3442,7 @@
       <repopackage name="libvamp-hostsdk3" arch="x86_64"/>
       <repopackage name="libvdeplug3" arch="x86_64"/>
       <repopackage name="libvdpau1" arch="x86_64"/>
+      <repopackage name="libvdpau_nouveau" arch="x86_64"/>
       <repopackage name="libvdpau_r300" arch="x86_64"/>
       <repopackage name="libvdpau_r600" arch="x86_64"/>
       <repopackage name="libvdpau_radeonsi" arch="x86_64"/>
@@ -3847,6 +3841,7 @@
       <repopackage name="Mesa" arch="x86_64"/>
       <repopackage name="Mesa-dri" arch="x86_64"/>
       <repopackage name="Mesa-dri-devel" arch="x86_64"/>
+      <repopackage name="Mesa-dri-nouveau" arch="x86_64"/>
       <repopackage name="Mesa-gallium" arch="x86_64"/>
       <repopackage name="Mesa-libEGL-devel" arch="x86_64"/>
       <repopackage name="Mesa-libEGL1" arch="x86_64"/>
@@ -5284,7 +5279,6 @@
       <repopackage name="typelib-1_0-AppIndicator3-0_1" arch="x86_64"/>
       <repopackage name="typelib-1_0-Atk-1_0" arch="x86_64"/>
       <repopackage name="typelib-1_0-Atspi-2_0" arch="x86_64"/>
-      <repopackage name="typelib-1_0-Caribou-1_0" arch="x86_64"/>
       <repopackage name="typelib-1_0-Champlain-0_12" arch="x86_64"/>
       <repopackage name="typelib-1_0-Clutter-1_0" arch="x86_64"/>
       <repopackage name="typelib-1_0-ClutterGst-3_0" arch="x86_64"/>
@@ -5531,6 +5525,7 @@
       <repopackage name="xf86-video-mach64" arch="x86_64"/>
       <repopackage name="xf86-video-mga" arch="x86_64"/>
       <repopackage name="xf86-video-neomagic" arch="x86_64"/>
+      <repopackage name="xf86-video-nouveau" arch="x86_64"/>
       <repopackage name="xf86-video-nv" arch="x86_64"/>
       <repopackage name="xf86-video-qxl" arch="x86_64"/>
       <repopackage name="xf86-video-r128" arch="x86_64"/>