diff --git a/script/manifest/update_manifest_local_dev.sh b/script/manifest/update_manifest_local_dev.sh
index abdc5c3..122978f 100755
--- a/script/manifest/update_manifest_local_dev.sh
+++ b/script/manifest/update_manifest_local_dev.sh
@@ -12,9 +12,22 @@ fi
 #EL_MANIFEST_PROD="./default.xml"
 #EL_MANIFEST_DEV="./manifest/default.dev.xml"
 
-# Update git-repo
+# Update git-repo : local git daemon serving the repo over git://127.0.0.1:9418.
+# Kill any leftover daemon from a previous (interrupted) run first: otherwise the
+# stale server keeps port 9418, the new daemon fails to bind ("Address already in
+# use"), and the cleanup kill below fails on an already-dead PID -> script exit 1.
+# Match on the stable arguments, not "git daemon": « git daemon » execs into
+# « git-daemon » (hyphen, /usr/lib/git-core/git-daemon), so "git daemon" (space)
+# never matches the actual running process.
+if pkill -f "daemon --base-path=. --export-all" 2>/dev/null; then
+  sleep 1  # let the kernel release port 9418 before we rebind
+fi
+
 git daemon --base-path=. --export-all --reuseaddr --informative-errors ${DAEMON_VERBOSE} &
 DAEMON_PID=$!
+# Always stop the daemon we started, whatever happens next (success or error),
+# without ever failing the script if it is already gone.
+trap 'kill "${DAEMON_PID}" 2>/dev/null || true' EXIT
 
 if [ -L "$EL_MANIFEST_DEV" ]; then
   MANIFEST_TARGET=$(readlink -f "$EL_MANIFEST_DEV")
@@ -34,4 +47,4 @@ fi
 .venv.erplibre/bin/repo init -u git://127.0.0.1:9418/ -b $(git rev-parse --verify HEAD) -m ${MANIFEST_TARGET} "$@"
 .venv.erplibre/bin/repo sync -c -j "$JOBS" ${REPO_VERBOSE} -m ${MANIFEST_TARGET}
 
-kill ${DAEMON_PID}
+# Daemon cleanup handled by the EXIT trap above (tolerant of an already-dead PID).