diff --git a/comps-f7.xml.in b/comps-f7.xml.in
index fabdc0b8..1a0de391 100644
--- a/comps-f7.xml.in
+++ b/comps-f7.xml.in
@@ -21,6 +21,16 @@
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>afrikaans-support</id>
+    <_name>Afrikaans Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>af</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-af</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>arabic-support</id>
     <_name>Arabic Support</_name>
@@ -116,6 +126,46 @@
       <packagereq type="conditional" requires="aspell">aspell-bn</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>bulgarian-support</id>
+    <_name>Bulgarian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>bg</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-bg</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>catalan-support</id>
+    <_name>Catalan Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ca</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ca</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>clustering</id>
+    <_name>Clustering</_name>
+    <_description>Clustering Support</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="optional">heartbeat</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>croatian-support</id>
+    <_name>Croatian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>hr</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-hr</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>czech-support</id>
     <_name>Czech Support</_name>
@@ -126,6 +176,16 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-dict-cs_CZ</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>danish-support</id>
+    <_name>Danish Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>da</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-da</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>development-tools</id>
     <_name>Development Tools</_name>
@@ -170,16 +230,19 @@
       <packagereq type="optional">flasm</packagereq>
       <packagereq type="optional">fpc</packagereq>
       <packagereq type="optional">ftnchek</packagereq>
+      <packagereq type="optional">gambas-ide</packagereq>
       <packagereq type="optional">gauche</packagereq>
       <packagereq type="optional">gcl</packagereq>
       <packagereq type="optional">gforth</packagereq>
       <packagereq type="optional">ghc</packagereq>
+      <packagereq type="optional">giggle</packagereq>
       <packagereq type="optional">git</packagereq>
       <packagereq type="optional">gnu-smalltalk</packagereq>
       <packagereq type="optional">gphpedit</packagereq>
       <packagereq type="optional">gprolog</packagereq>
       <packagereq type="optional">gpsim</packagereq>
       <packagereq type="optional">gputils</packagereq>
+      <packagereq type="optional">gtranslator</packagereq>
       <packagereq type="optional">haddock</packagereq>
       <packagereq type="optional">highlight</packagereq>
       <packagereq type="optional">hugs98</packagereq>
@@ -254,6 +317,16 @@
       <packagereq type="optional">pptp</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>dutch-support</id>
+    <_name>Dutch Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>nl</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-nl</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>editors</id>
     <_name>Editors</_name>
@@ -265,6 +338,7 @@
       <metapkg type="optional">xemacs</metapkg>
     </grouplist>
     <packagelist>
+      <packagereq type="optional">geany</packagereq>
       <packagereq type="optional">gobby</packagereq>
       <packagereq type="optional">jed</packagereq>
       <packagereq type="optional">leafpad</packagereq>
@@ -321,8 +395,10 @@
       <packagereq type="optional">genius</packagereq>
       <packagereq type="optional">geomview</packagereq>
       <packagereq type="optional">ghdl</packagereq>
+      <packagereq type="optional">gnome-chemistry-utils</packagereq>
       <packagereq type="optional">gnucap</packagereq>
       <packagereq type="optional">gpredict</packagereq>
+      <packagereq type="optional">grace</packagereq>
       <packagereq type="optional">grads</packagereq>
       <packagereq type="optional">gresistor</packagereq>
       <packagereq type="optional">gtkwave</packagereq>
@@ -382,6 +458,26 @@
       <packagereq type="optional">xtide</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>estonian-support</id>
+    <_name>Estonian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ee</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ee</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>french-support</id>
+    <_name>French Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>fr</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-fr</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>ftp-server</id>
     <_name>FTP Server</_name>
@@ -393,6 +489,16 @@
       <packagereq type="optional">pure-ftpd</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>galician-support</id>
+    <_name>Galician Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>gl</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-gl</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>games</id>
     <_name>Games and Entertainment</_name>
@@ -530,6 +636,16 @@
       <packagereq type="optional">zasx</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>german-support</id>
+    <_name>German Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>de</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-de</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>gnome-desktop</id>
     <_name>GNOME Desktop Environment</_name>
@@ -543,10 +659,12 @@
       <packagereq type="optional">byzanz</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">gdesklets</packagereq>
+      <packagereq type="optional">gimme</packagereq>
       <packagereq type="optional">glipper</packagereq>
       <packagereq type="optional">glunarclock</packagereq>
       <packagereq type="optional">gmpc</packagereq>
       <packagereq type="optional">gnochm</packagereq>
+      <packagereq type="optional">gnome-applet-music</packagereq>
       <packagereq type="optional">gnome-applet-netspeed</packagereq>
       <packagereq type="optional">gnome-applet-sensors</packagereq>
       <packagereq type="optional">gnome-applet-timer</packagereq>
@@ -641,6 +759,7 @@
       <packagereq type="optional">gajim</packagereq>
       <packagereq type="optional">galeon</packagereq>
       <packagereq type="optional">gg2</packagereq>
+      <packagereq type="optional">gnash-plugin</packagereq>
       <packagereq type="optional">gnome-blog</packagereq>
       <packagereq type="optional">gnome-ppp</packagereq>
       <packagereq type="optional">gnome-translate</packagereq>
@@ -723,6 +842,16 @@
       <packagereq type="optional">wings</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>greek-support</id>
+    <_name>Greek Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>el</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-el</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>gujarati-support</id>
     <_name>Gujarati Support</_name>
@@ -767,11 +896,42 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-he</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-he</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>hungarian-support</id>
+    <_name>Hungarian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>hu</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-hu</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>irish-support</id>
+    <_name>Irish Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ga</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ga</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>italian-support</id>
+    <_name>Italian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>it</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-it</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>japanese-support</id>
     <_name>Japanese Support</_name>
@@ -855,6 +1015,16 @@
       <packagereq type="optional">qt4-devel</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>lithuanian-support</id>
+    <_name>Lithuanian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>lt</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-lt</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>mail-server</id>
     <_name>Mail Server</_name>
@@ -883,6 +1053,16 @@
       <packagereq type="optional">uw-imap</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>malay-support</id>
+    <_name>Malay Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ms</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ms</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>marathi-support</id>
     <_name>Marathi Support</_name>
@@ -937,6 +1117,17 @@
       <packagereq type="optional">suck</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>norwegian-support</id>
+    <_name>Norwegian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>nb</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-nb</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-nn</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>office</id>
     <_name>Office/Productivity</_name>
@@ -953,7 +1144,9 @@
       <packagereq type="optional">glabels</packagereq>
       <packagereq type="optional">glom</packagereq>
       <packagereq type="optional">gnotime</packagereq>
+      <packagereq type="optional">gnucash</packagereq>
       <packagereq type="optional">gnumeric</packagereq>
+      <packagereq type="optional">gourmet</packagereq>
       <packagereq type="optional">gramps</packagereq>
       <packagereq type="optional">grisbi</packagereq>
       <packagereq type="optional">hnb</packagereq>
@@ -988,6 +1181,26 @@
       <packagereq type="conditional" requires="aspell">aspell-or</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>polish-support</id>
+    <_name>Polish Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>pl</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-pl</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>portuguese-support</id>
+    <_name>Portuguese Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>pt</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-pt</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>punjabi-support</id>
     <_name>Punjabi Support</_name>
@@ -999,6 +1212,36 @@
       <packagereq type="conditional" requires="aspell">aspell-pa</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>russian-support</id>
+    <_name>Russian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ru</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ru</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>slovak-support</id>
+    <_name>Slovak Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>sk</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-sk</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>slovenian-support</id>
+    <_name>Slovenian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>sl</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-sl</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>sound-and-video</id>
     <_name>Sound and Video</_name>
@@ -1030,6 +1273,7 @@
       <packagereq type="optional">gcdmaster</packagereq>
       <packagereq type="optional">gcfilms</packagereq>
       <packagereq type="optional">gcombust</packagereq>
+      <packagereq type="optional">gcstar</packagereq>
       <packagereq type="optional">gnomad2</packagereq>
       <packagereq type="optional">gnomebaker</packagereq>
       <packagereq type="optional">gnomeradio</packagereq>
@@ -1068,6 +1312,26 @@
       <packagereq type="optional">xmms-flac</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>spanish-support</id>
+    <_name>Spanish Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>es</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-es</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>swedish-support</id>
+    <_name>Swedish Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>sv</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-sv</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>system-tools</id>
     <_name>System Tools</_name>
@@ -1246,6 +1510,16 @@
       <packagereq type="optional">yafc</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>thai-support</id>
+    <_name>Thai Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>th</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-th</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>virtualization</id>
     <_name>Virtualization</_name>
@@ -1265,6 +1539,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">Django</packagereq>
+      <packagereq type="optional">gallery2</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1302,6 +1577,16 @@
       <packagereq type="optional">zope</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>welsh-support</id>
+    <_name>Welsh Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>cy</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-cy</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>window-managers</id>
     <_name>Window Managers</_name>
@@ -1421,6 +1706,16 @@
       <packagereq type="optional">xfce4-dev-tools</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>zulu-support</id>
+    <_name>Zulu Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>zu</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-zu</packagereq>
+    </packagelist>
+  </group>
   <category>
     <id>desktops</id>
     <_name>Desktop Environments</_name>
diff --git a/comps-fe7.xml.in b/comps-fe7.xml.in
index fabdc0b8..1a0de391 100644
--- a/comps-fe7.xml.in
+++ b/comps-fe7.xml.in
@@ -21,6 +21,16 @@
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>afrikaans-support</id>
+    <_name>Afrikaans Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>af</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-af</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>arabic-support</id>
     <_name>Arabic Support</_name>
@@ -116,6 +126,46 @@
       <packagereq type="conditional" requires="aspell">aspell-bn</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>bulgarian-support</id>
+    <_name>Bulgarian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>bg</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-bg</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>catalan-support</id>
+    <_name>Catalan Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ca</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ca</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>clustering</id>
+    <_name>Clustering</_name>
+    <_description>Clustering Support</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="optional">heartbeat</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>croatian-support</id>
+    <_name>Croatian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>hr</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-hr</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>czech-support</id>
     <_name>Czech Support</_name>
@@ -126,6 +176,16 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-dict-cs_CZ</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>danish-support</id>
+    <_name>Danish Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>da</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-da</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>development-tools</id>
     <_name>Development Tools</_name>
@@ -170,16 +230,19 @@
       <packagereq type="optional">flasm</packagereq>
       <packagereq type="optional">fpc</packagereq>
       <packagereq type="optional">ftnchek</packagereq>
+      <packagereq type="optional">gambas-ide</packagereq>
       <packagereq type="optional">gauche</packagereq>
       <packagereq type="optional">gcl</packagereq>
       <packagereq type="optional">gforth</packagereq>
       <packagereq type="optional">ghc</packagereq>
+      <packagereq type="optional">giggle</packagereq>
       <packagereq type="optional">git</packagereq>
       <packagereq type="optional">gnu-smalltalk</packagereq>
       <packagereq type="optional">gphpedit</packagereq>
       <packagereq type="optional">gprolog</packagereq>
       <packagereq type="optional">gpsim</packagereq>
       <packagereq type="optional">gputils</packagereq>
+      <packagereq type="optional">gtranslator</packagereq>
       <packagereq type="optional">haddock</packagereq>
       <packagereq type="optional">highlight</packagereq>
       <packagereq type="optional">hugs98</packagereq>
@@ -254,6 +317,16 @@
       <packagereq type="optional">pptp</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>dutch-support</id>
+    <_name>Dutch Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>nl</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-nl</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>editors</id>
     <_name>Editors</_name>
@@ -265,6 +338,7 @@
       <metapkg type="optional">xemacs</metapkg>
     </grouplist>
     <packagelist>
+      <packagereq type="optional">geany</packagereq>
       <packagereq type="optional">gobby</packagereq>
       <packagereq type="optional">jed</packagereq>
       <packagereq type="optional">leafpad</packagereq>
@@ -321,8 +395,10 @@
       <packagereq type="optional">genius</packagereq>
       <packagereq type="optional">geomview</packagereq>
       <packagereq type="optional">ghdl</packagereq>
+      <packagereq type="optional">gnome-chemistry-utils</packagereq>
       <packagereq type="optional">gnucap</packagereq>
       <packagereq type="optional">gpredict</packagereq>
+      <packagereq type="optional">grace</packagereq>
       <packagereq type="optional">grads</packagereq>
       <packagereq type="optional">gresistor</packagereq>
       <packagereq type="optional">gtkwave</packagereq>
@@ -382,6 +458,26 @@
       <packagereq type="optional">xtide</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>estonian-support</id>
+    <_name>Estonian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ee</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ee</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>french-support</id>
+    <_name>French Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>fr</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-fr</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>ftp-server</id>
     <_name>FTP Server</_name>
@@ -393,6 +489,16 @@
       <packagereq type="optional">pure-ftpd</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>galician-support</id>
+    <_name>Galician Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>gl</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-gl</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>games</id>
     <_name>Games and Entertainment</_name>
@@ -530,6 +636,16 @@
       <packagereq type="optional">zasx</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>german-support</id>
+    <_name>German Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>de</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-de</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>gnome-desktop</id>
     <_name>GNOME Desktop Environment</_name>
@@ -543,10 +659,12 @@
       <packagereq type="optional">byzanz</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">gdesklets</packagereq>
+      <packagereq type="optional">gimme</packagereq>
       <packagereq type="optional">glipper</packagereq>
       <packagereq type="optional">glunarclock</packagereq>
       <packagereq type="optional">gmpc</packagereq>
       <packagereq type="optional">gnochm</packagereq>
+      <packagereq type="optional">gnome-applet-music</packagereq>
       <packagereq type="optional">gnome-applet-netspeed</packagereq>
       <packagereq type="optional">gnome-applet-sensors</packagereq>
       <packagereq type="optional">gnome-applet-timer</packagereq>
@@ -641,6 +759,7 @@
       <packagereq type="optional">gajim</packagereq>
       <packagereq type="optional">galeon</packagereq>
       <packagereq type="optional">gg2</packagereq>
+      <packagereq type="optional">gnash-plugin</packagereq>
       <packagereq type="optional">gnome-blog</packagereq>
       <packagereq type="optional">gnome-ppp</packagereq>
       <packagereq type="optional">gnome-translate</packagereq>
@@ -723,6 +842,16 @@
       <packagereq type="optional">wings</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>greek-support</id>
+    <_name>Greek Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>el</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-el</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>gujarati-support</id>
     <_name>Gujarati Support</_name>
@@ -767,11 +896,42 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-he</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-he</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>hungarian-support</id>
+    <_name>Hungarian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>hu</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-hu</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>irish-support</id>
+    <_name>Irish Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ga</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ga</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>italian-support</id>
+    <_name>Italian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>it</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-it</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>japanese-support</id>
     <_name>Japanese Support</_name>
@@ -855,6 +1015,16 @@
       <packagereq type="optional">qt4-devel</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>lithuanian-support</id>
+    <_name>Lithuanian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>lt</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-lt</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>mail-server</id>
     <_name>Mail Server</_name>
@@ -883,6 +1053,16 @@
       <packagereq type="optional">uw-imap</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>malay-support</id>
+    <_name>Malay Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ms</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ms</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>marathi-support</id>
     <_name>Marathi Support</_name>
@@ -937,6 +1117,17 @@
       <packagereq type="optional">suck</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>norwegian-support</id>
+    <_name>Norwegian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>nb</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-nb</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-nn</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>office</id>
     <_name>Office/Productivity</_name>
@@ -953,7 +1144,9 @@
       <packagereq type="optional">glabels</packagereq>
       <packagereq type="optional">glom</packagereq>
       <packagereq type="optional">gnotime</packagereq>
+      <packagereq type="optional">gnucash</packagereq>
       <packagereq type="optional">gnumeric</packagereq>
+      <packagereq type="optional">gourmet</packagereq>
       <packagereq type="optional">gramps</packagereq>
       <packagereq type="optional">grisbi</packagereq>
       <packagereq type="optional">hnb</packagereq>
@@ -988,6 +1181,26 @@
       <packagereq type="conditional" requires="aspell">aspell-or</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>polish-support</id>
+    <_name>Polish Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>pl</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-pl</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>portuguese-support</id>
+    <_name>Portuguese Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>pt</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-pt</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>punjabi-support</id>
     <_name>Punjabi Support</_name>
@@ -999,6 +1212,36 @@
       <packagereq type="conditional" requires="aspell">aspell-pa</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>russian-support</id>
+    <_name>Russian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ru</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ru</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>slovak-support</id>
+    <_name>Slovak Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>sk</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-sk</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>slovenian-support</id>
+    <_name>Slovenian Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>sl</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-sl</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>sound-and-video</id>
     <_name>Sound and Video</_name>
@@ -1030,6 +1273,7 @@
       <packagereq type="optional">gcdmaster</packagereq>
       <packagereq type="optional">gcfilms</packagereq>
       <packagereq type="optional">gcombust</packagereq>
+      <packagereq type="optional">gcstar</packagereq>
       <packagereq type="optional">gnomad2</packagereq>
       <packagereq type="optional">gnomebaker</packagereq>
       <packagereq type="optional">gnomeradio</packagereq>
@@ -1068,6 +1312,26 @@
       <packagereq type="optional">xmms-flac</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>spanish-support</id>
+    <_name>Spanish Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>es</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-es</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>swedish-support</id>
+    <_name>Swedish Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>sv</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-sv</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>system-tools</id>
     <_name>System Tools</_name>
@@ -1246,6 +1510,16 @@
       <packagereq type="optional">yafc</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>thai-support</id>
+    <_name>Thai Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>th</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-th</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>virtualization</id>
     <_name>Virtualization</_name>
@@ -1265,6 +1539,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">Django</packagereq>
+      <packagereq type="optional">gallery2</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1302,6 +1577,16 @@
       <packagereq type="optional">zope</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>welsh-support</id>
+    <_name>Welsh Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>cy</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-cy</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>window-managers</id>
     <_name>Window Managers</_name>
@@ -1421,6 +1706,16 @@
       <packagereq type="optional">xfce4-dev-tools</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>zulu-support</id>
+    <_name>Zulu Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>zu</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-zu</packagereq>
+    </packagelist>
+  </group>
   <category>
     <id>desktops</id>
     <_name>Desktop Environments</_name>