diff --git a/.gitignore b/.gitignore
index 5aae5cd..2b2cdea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /wayback-d7baac7.tar.gz
 /wayback-0.1.tar.bz2
 /wayback-0.2.tar.bz2
+/wayback-0.3.tar.bz2
diff --git a/sources b/sources
index f389d6f..63646ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wayback-0.2.tar.bz2) = 6a262c14b5812db3625edefa3d8b3c1857c19aadb44701580641893cd72791d6d7e0034522160d1a84f4613cec6244eee6a3baed60469c404940b1f75a636fe1
+SHA512 (wayback-0.3.tar.bz2) = 1e82483d189688a800a71e75d71f61319ee04c067882db4af04c959392ecfd6dc9b83f493ec5891e5941bf5fd690cf8482f6952d8b8ea15bdc2317cfd420a37d
diff --git a/wayback.spec b/wayback.spec
index d332d89..c1bc5eb 100644
--- a/wayback.spec
+++ b/wayback.spec
@@ -1,7 +1,10 @@
 %global xwlver 24.1
 
+# Allow wayback to stand as an X11 server
+%bcond xserver 0
+
 Name:           wayback
-Version:        0.2
+Version:        0.3
 Release:        %autorelease
 Summary:        X11 compatibility layer built on wlroots and Xwayland
 
@@ -27,6 +30,35 @@ Requires:       xorg-x11-server-Xwayland%{?_isa} >= %{xwlver}
 %description
 %{summary}.
 
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/Xwayback
+%{_bindir}/wayback-*
+%{_libexecdir}/wayback-*
+%{_mandir}/man1/*wayback*.1*
+
+%dnl ----------------------------------------------------------------
+%if %{with xserver}
+
+%package        xserver
+Summary:        %{name} shim to provide /usr/bin/X
+Requires:       %{name} = %{version}-%{release}
+Provides:       Xserver
+Conflicts:      xorg-x11-server-Xorg
+
+%description    xserver
+This package provides the shim links for %{name} to be automatically
+used as the Xserver. This ensures that %{name} is used as the system
+provider of the Xserver.
+
+%files xserver
+%{_bindir}/X
+
+%endif
+%dnl ----------------------------------------------------------------
+
+
 %prep
 %autosetup -S git_am
 
@@ -42,14 +74,10 @@ Requires:       xorg-x11-server-Xwayland%{?_isa} >= %{xwlver}
 %install
 %meson_install
 
-
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/Xwayback
-%{_bindir}/wayback-*
-%{_libexecdir}/wayback-*
-%{_mandir}/man1/*wayback*.1*
+%if %{with xserver}
+# Allow Xwayback to be called as X
+ln -sr %{buildroot}%{_bindir}/Xwayback %{buildroot}%{_bindir}/X
+%endif
 
 
 %changelog