diff --git a/anda/stardust/solar-sailer/nightly/anda.hcl b/anda/stardust/solar-sailer/nightly/anda.hcl
new file mode 100644
index 0000000000..1af8e28476
--- /dev/null
+++ b/anda/stardust/solar-sailer/nightly/anda.hcl
@@ -0,0 +1,8 @@
+project pkg {
+	rpm {
+		spec = "stardust-solar-sailer-nightly.spec"
+	}
+	labels {
+	    nightly = 1
+	}
+}
diff --git a/anda/stardust/solar-sailer/nightly/stardust-solar-sailer-nightly.spec b/anda/stardust/solar-sailer/nightly/stardust-solar-sailer-nightly.spec
new file mode 100644
index 0000000000..547e73e235
--- /dev/null
+++ b/anda/stardust/solar-sailer/nightly/stardust-solar-sailer-nightly.spec
@@ -0,0 +1,46 @@
+%global commit 40ca9fc446756a5151275dcbac914cee399dbc4c
+%global commit_date 20251218
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+# Exclude input files from mangling
+%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
+
+Name:           stardust-xr-solar-sailer-nightly
+Version:        0~%{commit_date}git.%{shortcommit}
+Release:        1%?dist
+Summary:        Glide through space! This play space mover allows you to fly by dragging the space with momentum!
+URL:            https://github.com/StardustXR/solar-sailer
+Source0:        %url/archive/%commit.tar.gz
+License:        MIT
+BuildRequires:  cargo anda-srpm-macros cargo-rpm-macros mold python3-devel
+
+Provides:       solar-sailer-nightly stardust-solar-sailer-nightly
+Conflicts:      stardust-xr-solar-sailer
+Packager:       Owen Zimmerman <owen@fyralabs.com>
+
+%description
+%summary
+
+%prep
+%autosetup -n solar-sailer-%commit
+%cargo_prep_online
+
+%build
+%cargo_build
+
+%install
+mkdir -p %{buildroot}%{_datadir}/%{name}/solar_sailer
+%cargo_install
+install -Dm644 res/solar_sailer/move_icon.glb %{buildroot}%{_datadir}/%{name}/solar_sailer/move_icon.glb
+%{cargo_license_online} > LICENSE.dependencies
+
+%files
+%doc README.md
+%license LICENSE
+%license LICENSE.dependencies
+%_bindir/solar-sailer
+%{_datadir}/%{name}/solar_sailer/move_icon.glb
+
+%changelog
+* Sun Jan 11 2026 Owen Zimmerman <owen@fyralabs.com>
+- Initial commit (port from stable)
diff --git a/anda/stardust/solar-sailer/nightly/update.rhai b/anda/stardust/solar-sailer/nightly/update.rhai
new file mode 100644
index 0000000000..9f0a8a6e6b
--- /dev/null
+++ b/anda/stardust/solar-sailer/nightly/update.rhai
@@ -0,0 +1,5 @@
+rpm.global("commit", gh_commit("StardustXR/solar-sailer"));
+if rpm.changed() {
+  rpm.release();
+  rpm.global("commit_date", date());
+}
diff --git a/anda/stardust/solar-sailer/anda.hcl b/anda/stardust/solar-sailer/stable/anda.hcl
similarity index 100%
rename from anda/stardust/solar-sailer/anda.hcl
rename to anda/stardust/solar-sailer/stable/anda.hcl
diff --git a/anda/stardust/solar-sailer/stardust-solar-sailer.spec b/anda/stardust/solar-sailer/stable/stardust-solar-sailer.spec
similarity index 100%
rename from anda/stardust/solar-sailer/stardust-solar-sailer.spec
rename to anda/stardust/solar-sailer/stable/stardust-solar-sailer.spec
diff --git a/anda/stardust/solar-sailer/update.rhai b/anda/stardust/solar-sailer/stable/update.rhai
similarity index 100%
rename from anda/stardust/solar-sailer/update.rhai
rename to anda/stardust/solar-sailer/stable/update.rhai