diff --git a/fedora-budgie-common.ks b/fedora-budgie-common.ks
new file mode 100644
index 0000000..2f761aa
--- /dev/null
+++ b/fedora-budgie-common.ks
@@ -0,0 +1,19 @@
+%packages
+fedora-release-budgie
+
+# Exclude unwanted groups that fedora-live-base.ks pulls in
+-@dial-up
+-@input-methods
+-@standard
+
+# Install budgie environment
+@^budgie-desktop-environment
+
+# recommended apps
+@budgie-desktop-apps
+
+# Exclude unwanted packages from @anaconda-tools group
+-gfs2-utils
+-reiserfs-utils
+
+%end
diff --git a/fedora-disk-budgie.ks b/fedora-disk-budgie.ks
new file mode 100644
index 0000000..636f606
--- /dev/null
+++ b/fedora-disk-budgie.ks
@@ -0,0 +1,5 @@
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-budgie-common.ks
+
+autopart --type=btrfs --noswap
diff --git a/fedora-live-budgie.ks b/fedora-live-budgie.ks
new file mode 100644
index 0000000..4d80383
--- /dev/null
+++ b/fedora-live-budgie.ks
@@ -0,0 +1,17 @@
+# Description:
+# - Fedora Live Spin with the Budgie Desktop Environment
+# 
+# Maintainer(s):
+# - Joshua Strobl <joshua@buddiesofbudgie.org>
+
+%include fedora-live-base.ks
+%include fedora-budgie-common.ks
+
+part / --size 7750
+
+%post
+
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="budgie"/' /etc/sysconfig/livesys
+
+%end
diff --git a/maintainers.toml b/maintainers.toml
index e9df6eb..cabcef6 100644
--- a/maintainers.toml
+++ b/maintainers.toml
@@ -81,3 +81,7 @@ maintainers = [ "Justin Flory", "Dan Čermák", "Nasir Hussain", "Odilon Junior"
 [eln]
 fas = [ "sgallagh", "tdawson", "asamalik" ]
 maintainers = [ "Stephen Gallagher", "Troy Dawson", "Adam Samalik" ]
+
+[spins.budgie.x86_64]
+fas = [ "joshstrobl" ]
+maintainers = [ "Joshua Strobl" ]