diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index c1f6e174..535b2791 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -214,12 +214,12 @@
       <packagereq type="mandatory">bzip2</packagereq>
       <packagereq type="mandatory">crontabs</packagereq>
       <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
+      <packagereq type="mandatory">dbus</packagereq>
       <packagereq type="mandatory">ed</packagereq>
       <packagereq type="mandatory">logrotate</packagereq>
       <packagereq type="mandatory">lsof</packagereq>
       <packagereq type="mandatory">mailcap</packagereq>
       <packagereq type="mandatory">man</packagereq>
-      <packagereq type="mandatory">dbus</packagereq>
       <packagereq type="mandatory">NetworkManager</packagereq>
       <packagereq type="mandatory">ntsysv</packagereq>
       <packagereq type="mandatory">parted</packagereq>
@@ -1252,6 +1252,25 @@
       <packagereq type="optional">unbound</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>dogtag</id>
+    <_name>Dogtag Certificate System</_name>
+    <_description>Enterprise-class open source Certificate Authority</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">pki-ca</packagereq>
+      <packagereq type="default">pki-console</packagereq>
+      <packagereq type="default">pki-kra</packagereq>
+      <packagereq type="default">pki-ocsp</packagereq>
+      <packagereq type="optional">pki-common-javadoc</packagereq>
+      <packagereq type="optional">pki-java-tools-javadoc</packagereq>
+      <packagereq type="optional">pki-ra</packagereq>
+      <packagereq type="optional">pki-tks</packagereq>
+      <packagereq type="optional">pki-tps</packagereq>
+      <packagereq type="optional">pki-util-javadoc</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>dutch-support</id>
     <_name>Dutch Support</_name>
@@ -1851,8 +1870,8 @@
       <packagereq type="default">lklug-fonts</packagereq>
       <packagereq type="default">lohit-assamese-fonts</packagereq>
       <packagereq type="default">lohit-bengali-fonts</packagereq>
-      <packagereq type="default">lohit-gujarati-fonts</packagereq>
       <packagereq type="default">lohit-devanagari-fonts</packagereq>
+      <packagereq type="default">lohit-gujarati-fonts</packagereq>
       <packagereq type="default">lohit-kannada-fonts</packagereq>
       <packagereq type="default">lohit-oriya-fonts</packagereq>
       <packagereq type="default">lohit-punjabi-fonts</packagereq>
@@ -2860,7 +2879,6 @@
       <packagereq type="optional">tangogps</packagereq>
       <packagereq type="optional">thunderbird</packagereq>
       <packagereq type="optional">torium</packagereq>
-      <packagereq type="optional">transmission-gtk</packagereq>
       <packagereq type="optional">transmission-qt</packagereq>
       <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">urlgfe</packagereq>