diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index 083c9af2..4a0929e2 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -7013,7 +7013,7 @@
       <groupid>gnome-desktop</groupid>
       <groupid>kde-desktop</groupid>
       <groupid>lxde-desktop</groupid>
-      <groupid>moblin-desktop</groupid>
+      <groupid>meego-netbook</groupid>
       <groupid>sugar-desktop</groupid>
       <groupid>window-managers</groupid>
       <groupid>xfce-desktop</groupid>
@@ -7055,6 +7055,7 @@
       <groupid>kde-software-development</groupid>
       <groupid>legacy-software-development</groupid>
       <groupid>libreoffice-development</groupid>
+      <groupid>milkymist</groupid>
       <groupid>mingw32</groupid>
       <groupid>ocaml</groupid>
       <groupid>perl</groupid>
@@ -7074,6 +7075,7 @@
       <groupid>clustering</groupid>
       <groupid>directory-server</groupid>
       <groupid>dns-server</groupid>
+      <groupid>dogtag</groupid>
       <groupid>ftp-server</groupid>
       <groupid>legacy-network-server</groupid>
       <groupid>mail-server</groupid>
diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index 083c9af2..4a0929e2 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -7013,7 +7013,7 @@
       <groupid>gnome-desktop</groupid>
       <groupid>kde-desktop</groupid>
       <groupid>lxde-desktop</groupid>
-      <groupid>moblin-desktop</groupid>
+      <groupid>meego-netbook</groupid>
       <groupid>sugar-desktop</groupid>
       <groupid>window-managers</groupid>
       <groupid>xfce-desktop</groupid>
@@ -7055,6 +7055,7 @@
       <groupid>kde-software-development</groupid>
       <groupid>legacy-software-development</groupid>
       <groupid>libreoffice-development</groupid>
+      <groupid>milkymist</groupid>
       <groupid>mingw32</groupid>
       <groupid>ocaml</groupid>
       <groupid>perl</groupid>
@@ -7074,6 +7075,7 @@
       <groupid>clustering</groupid>
       <groupid>directory-server</groupid>
       <groupid>dns-server</groupid>
+      <groupid>dogtag</groupid>
       <groupid>ftp-server</groupid>
       <groupid>legacy-network-server</groupid>
       <groupid>mail-server</groupid>