diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages
index 1c01081e99..5824e642a2 100644
--- a/install/omarchy-base.packages
+++ b/install/omarchy-base.packages
@@ -50,7 +50,7 @@ gum
 gvfs-mtp
 gvfs-nfs
 gvfs-smb
-herdr
+herdr-git
 hyprland
 hyprland-guiutils
 hyprland-preview-share-picker
diff --git a/migrations/1787155435.sh b/migrations/1787155435.sh
new file mode 100644
index 0000000000..d193b824b0
--- /dev/null
+++ b/migrations/1787155435.sh
@@ -0,0 +1,19 @@
+echo "Switch to the herdr-git package that follows upstream Herdr"
+
+# herdr was built from an Omarchy fork whose only divergence was replaying an
+# agent's CLI options on resume, work upstream declined twice. herdr-git drops
+# the fork and follows upstream master, which renames the package.
+
+if omarchy-pkg-present herdr-git; then
+  exit 0
+fi
+
+# One transaction rather than a drop and an add: the session is usually running
+# inside herdr, and an install that failed between the two would leave it with
+# no terminal. --noconfirm answers "no" to the conflict herdr-git raises against
+# the installed herdr, so --ask 4 preselects removing it.
+sudo pacman -S --noconfirm --ask 4 --needed herdr-git
+
+# pacman does not always exit non-zero when a package fails to install, and a
+# migration that marked itself done would leave this machine on the fork for good.
+omarchy-pkg-present herdr-git