diff --git a/comps-f7.xml.in b/comps-f7.xml.in
index 2e2660e6..16e62610 100644
--- a/comps-f7.xml.in
+++ b/comps-f7.xml.in
@@ -38,6 +38,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="conditional" requires="aspell">aspell-ar</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
     </packagelist>
@@ -76,6 +77,15 @@
       <packagereq type="optional">w3c-markup-validator</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>base</id>
+    <_name>Base</_name>
+    <default>true</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-en</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>base-x</id>
     <_name>X Window System</_name>
@@ -172,7 +182,9 @@
     <_description>This group is a collection of tools and resources of Czech environments.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
+    <langonly>cs</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-cs</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-dict-cs_CZ</packagereq>
     </packagelist>
   </group>
@@ -922,6 +934,16 @@
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>hindi-support</id>
+    <_name>Hindi Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>hi</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>hungarian-support</id>
     <_name>Hungarian Support</_name>
@@ -1560,6 +1582,16 @@
       <packagereq type="conditional" requires="hunspell">hunspell-th</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>urdu-support</id>
+    <_name>Urdu Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ur</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>virtualization</id>
     <_name>Virtualization</_name>
diff --git a/comps-fe7.xml.in b/comps-fe7.xml.in
index 2e2660e6..16e62610 100644
--- a/comps-fe7.xml.in
+++ b/comps-fe7.xml.in
@@ -38,6 +38,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="conditional" requires="aspell">aspell-ar</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
     </packagelist>
@@ -76,6 +77,15 @@
       <packagereq type="optional">w3c-markup-validator</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>base</id>
+    <_name>Base</_name>
+    <default>true</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-en</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>base-x</id>
     <_name>X Window System</_name>
@@ -172,7 +182,9 @@
     <_description>This group is a collection of tools and resources of Czech environments.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
+    <langonly>cs</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-cs</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-dict-cs_CZ</packagereq>
     </packagelist>
   </group>
@@ -922,6 +934,16 @@
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>hindi-support</id>
+    <_name>Hindi Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>hi</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>hungarian-support</id>
     <_name>Hungarian Support</_name>
@@ -1560,6 +1582,16 @@
       <packagereq type="conditional" requires="hunspell">hunspell-th</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>urdu-support</id>
+    <_name>Urdu Support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ur</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>virtualization</id>
     <_name>Virtualization</_name>