diff --git a/comps-f12.xml.in b/comps-f12.xml.in
index e49684ab..a4fe46ed 100644
--- a/comps-f12.xml.in
+++ b/comps-f12.xml.in
@@ -2298,6 +2298,7 @@
       <packagereq type="default">gnome-user-docs</packagereq>
       <packagereq type="default">gnome-user-share</packagereq>
       <packagereq type="default">gnome-utils</packagereq>
+      <packagereq type="default">gnote</packagereq>
       <packagereq type="default">gok</packagereq>
       <packagereq type="default">gst-mixer</packagereq>
       <packagereq type="default">gthumb</packagereq>
@@ -2314,7 +2315,6 @@
       <packagereq type="default">orca</packagereq>
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
-      <packagereq type="default">tomboy</packagereq>
       <packagereq type="default">vino</packagereq>
       <packagereq type="default">xdg-user-dirs-gtk</packagereq>
       <packagereq type="default">zenity</packagereq>
@@ -2349,7 +2349,6 @@
       <packagereq type="optional">gnome-schedule</packagereq>
       <packagereq type="optional">gnome-theme-curvylooks</packagereq>
       <packagereq type="optional">gnomesword</packagereq>
-      <packagereq type="optional">gnote</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
@@ -2378,6 +2377,7 @@
       <packagereq type="optional">tango-icon-theme</packagereq>
       <packagereq type="optional">tango-icon-theme-extras</packagereq>
       <packagereq type="optional">themes-backgrounds-gnome</packagereq>
+      <packagereq type="optional">tomboy</packagereq>
       <packagereq type="optional">tracker-search-tool</packagereq>
       <packagereq type="optional">verbiste-gnome</packagereq>
       <packagereq type="optional">vinagre</packagereq>