diff --git a/Makefile b/Makefile
index 21cf3e2..da29fe4 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,10 @@ ifeq ($(WITH_SDDM),yes)
 install: install-sddm
 endif
 
+ifeq ($(WITH_WAYBAR),yes)
+include waybar/build.mk
+endif
+
 install: install-sway install-swaylock
 
 check:
diff --git a/sway-config-fedora.spec.rpkg b/sway-config-fedora.spec.rpkg
index 208bbd7..8935d7a 100644
--- a/sway-config-fedora.spec.rpkg
+++ b/sway-config-fedora.spec.rpkg
@@ -1,7 +1,9 @@
 # vim: ft=spec
 %bcond  initialsetup %[0%{?fedora} >= 40 || 0%{?rhel} >= 10]
 %bcond  sddm 1
+%bcond  waybar 1
 %global sway_ver 1.8
+%global waybar_ver 0.9.24
 
 Name:           {{{ git_name }}}
 Version:        {{{ git_version }}}
@@ -88,6 +90,23 @@ This package contains configuration and dependencies for SDDM
 to use Sway for the greeter display server.
 %endif
 
+%if %{with waybar}
+%package -n     waybar-config-fedora
+Summary:        Fedora Sway Spin configuration for Waybar
+
+Requires:       waybar >= %{waybar_ver}
+Provides:       waybar-config = %{waybar_ver}+%{version}-%{release}
+Conflicts:      waybar-config
+
+%description -n waybar-config-fedora
+%{summary}.
+
+%files -n waybar-config-fedora
+%license LICENSE
+%config(noreplace) %{_sysconfdir}/xdg/waybar/config
+%config(noreplace) %{_sysconfdir}/xdg/waybar/style.css
+%endif
+
 
 %prep
 {{{ git_setup_macro path=$(git rev-parse --show-toplevel) }}}
@@ -98,7 +117,10 @@ to use Sway for the greeter display server.
 
 
 %install
-%make_install PREFIX='%{_prefix}' WITH_INITIALSETUP='%[%{with initialsetup}?"yes":"no"]' WITH_SDDM='%[%{with sddm}?"yes":"no"]'
+%make_install PREFIX='%{_prefix}' \
+    WITH_INITIALSETUP='%[%{with initialsetup}?"yes":"no"]' \
+    WITH_SDDM='%[%{with sddm}?"yes":"no"]' \
+    WITH_WAYBAR='%[%{with waybar}?"yes":"no"]'
 
 
 %files
diff --git a/waybar/build.mk b/waybar/build.mk
new file mode 100644
index 0000000..6d60675
--- /dev/null
+++ b/waybar/build.mk
@@ -0,0 +1,7 @@
+.PHONY: install-waybar
+
+install-waybar:
+	install -D -m 0644 -pv -t $(DESTDIR)$(SYSCONFDIR)/xdg/waybar \
+		waybar/config waybar/style.css
+
+install: install-waybar