diff --git a/comps-f37.xml.in b/comps-f37.xml.in
index abe543c4..7870c1e3 100644
--- a/comps-f37.xml.in
+++ b/comps-f37.xml.in
@@ -311,6 +311,77 @@
       <packagereq>xmonad-basic</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>budgie-desktop</id>
+    <_name>Budgie</_name>
+    <_description>Budgie Desktop is a feature-rich, modern desktop environment.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">budgie-backgrounds</packagereq>
+      <packagereq type="mandatory">budgie-control-center</packagereq>
+      <packagereq type="mandatory">budgie-desktop</packagereq>
+      <packagereq type="mandatory">budgie-desktop-defaults</packagereq>
+      <packagereq type="mandatory">budgie-desktop-view</packagereq>
+      <packagereq type="mandatory">budgie-screensaver</packagereq>
+      <packagereq type="mandatory">dconf</packagereq>
+      <packagereq type="mandatory">gnome-settings-daemon</packagereq>
+      <packagereq type="mandatory">gnome-software</packagereq>
+      <packagereq type="mandatory">lightdm</packagereq>
+      <packagereq type="mandatory">network-manager-applet</packagereq>
+      <packagereq type="mandatory">polkit</packagereq>
+      <packagereq type="mandatory">slick-greeter</packagereq>
+      <packagereq type="default">at-spi2-atk</packagereq>
+      <packagereq type="default">at-spi2-core</packagereq>
+      <packagereq arch="aarch64,ppc64le,x86_64" type="default">fprintd-pam</packagereq>
+      <packagereq type="default">glib-networking</packagereq>
+      <packagereq type="default">gnome-bluetooth</packagereq>
+      <packagereq type="default">gnome-color-manager</packagereq>
+      <packagereq type="default">gnome-disk-utility</packagereq>
+      <packagereq type="default">gnome-keyring-pam</packagereq>
+      <packagereq arch="aarch64,ppc64le,x86_64" type="default">gvfs-afc</packagereq>
+      <packagereq type="default">gvfs-afp</packagereq>
+      <packagereq type="default">gvfs-archive</packagereq>
+      <packagereq type="default">gvfs-fuse</packagereq>
+      <packagereq type="default">gvfs-goa</packagereq>
+      <packagereq type="default">gvfs-gphoto2</packagereq>
+      <packagereq type="default">gvfs-mtp</packagereq>
+      <packagereq type="default">gvfs-smb</packagereq>
+      <packagereq type="default">ModemManager</packagereq>
+      <packagereq type="default">NetworkManager-adsl</packagereq>
+      <packagereq type="default">NetworkManager-openconnect-gnome</packagereq>
+      <packagereq type="default">NetworkManager-openvpn-gnome</packagereq>
+      <packagereq type="default">NetworkManager-ppp</packagereq>
+      <packagereq type="default">NetworkManager-pptp-gnome</packagereq>
+      <packagereq type="default">NetworkManager-ssh-gnome</packagereq>
+      <packagereq type="default">NetworkManager-vpnc-gnome</packagereq>
+      <packagereq type="default">NetworkManager-wwan</packagereq>
+      <packagereq type="default">xdg-desktop-portal</packagereq>
+      <packagereq type="default">xdg-desktop-portal-gtk</packagereq>
+      <packagereq type="default">xdg-user-dirs-gtk</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>budgie-desktop-apps</id>
+    <_name>Budgie Desktop Applications</_name>
+    <_description>Recommended applications to use with Budgie Desktop</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">atril</packagereq>
+      <packagereq type="default">eom</packagereq>
+      <packagereq type="default">firefox</packagereq>
+      <packagereq type="default">gedit</packagereq>
+      <packagereq type="default">gnome-calculator</packagereq>
+      <packagereq type="default">gnome-disk-utility</packagereq>
+      <packagereq type="default">gnome-system-monitor</packagereq>
+      <packagereq type="default">gnome-terminal</packagereq>
+      <packagereq type="default">nemo</packagereq>
+      <packagereq type="default">parole</packagereq>
+      <packagereq type="default">seahorse</packagereq>
+      <packagereq arch="aarch64,ppc64le,x86_64" type="default">rhythmbox</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>buildsys-build</id>
     <_name>Buildsystem building group</_name>
@@ -6322,6 +6393,28 @@
       <groupid>cloud-management</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>budgie-desktop-environment</id>
+    <_name>Budgie Desktop</_name>
+    <_description>Budgie Desktop is a feature-rich, modern desktop environment.</_description>
+    <display_order>27</display_order>
+    <grouplist>
+      <groupid>base-x</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>admin-tools</groupid>
+      <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
+      <groupid>input-methods</groupid>
+      <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>printing</groupid>
+      <groupid>guest-desktop-agents</groupid>
+      <groupid>budgie-desktop</groupid>
+      <groupid>budgie-desktop-apps</groupid>
+    </grouplist>
+  </environment>
   <environment>
     <!-- Intended to allow interactive installation of components that will eventually be
          used in a cloud image. -->
@@ -6623,6 +6716,18 @@
       <groupid>deepin-desktop-office</groupid>
     </grouplist>
   </category>
+  <category>
+    <id>budgie-desktop-environment</id>
+    <_name>Budgie Desktop</_name>
+    <_description>Budgie Desktop is a feature-rich, modern desktop environment.</_description>
+    <display_order>27</display_order>
+    <grouplist>
+      <groupid>budgie-desktop</groupid>
+      <groupid>budgie-desktop-apps</groupid>
+      <groupid>firefox</groupid>
+      <groupid>libreoffice</groupid>
+    </grouplist>
+  </category>
   <category>
     <id>gnome-desktop-environment</id>
     <_name>GNOME Desktop</_name>
diff --git a/comps-f38.xml.in b/comps-f38.xml.in
index d7056b67..4f55e0b0 100644
--- a/comps-f38.xml.in
+++ b/comps-f38.xml.in
@@ -360,12 +360,14 @@
       <packagereq type="default">atril</packagereq>
       <packagereq type="default">eom</packagereq>
       <packagereq type="default">firefox</packagereq>
+      <packagereq type="default">gedit</packagereq>
       <packagereq type="default">gnome-calculator</packagereq>
       <packagereq type="default">gnome-disk-utility</packagereq>
       <packagereq type="default">gnome-system-monitor</packagereq>
       <packagereq type="default">gnome-terminal</packagereq>
       <packagereq type="default">nemo</packagereq>
       <packagereq type="default">parole</packagereq>
+      <packagereq type="default">seahorse</packagereq>
       <packagereq arch="aarch64,ppc64le,x86_64" type="default">rhythmbox</packagereq>
     </packagelist>
   </group>
diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index d7056b67..4f55e0b0 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -360,12 +360,14 @@
       <packagereq type="default">atril</packagereq>
       <packagereq type="default">eom</packagereq>
       <packagereq type="default">firefox</packagereq>
+      <packagereq type="default">gedit</packagereq>
       <packagereq type="default">gnome-calculator</packagereq>
       <packagereq type="default">gnome-disk-utility</packagereq>
       <packagereq type="default">gnome-system-monitor</packagereq>
       <packagereq type="default">gnome-terminal</packagereq>
       <packagereq type="default">nemo</packagereq>
       <packagereq type="default">parole</packagereq>
+      <packagereq type="default">seahorse</packagereq>
       <packagereq arch="aarch64,ppc64le,x86_64" type="default">rhythmbox</packagereq>
     </packagelist>
   </group>