diff --git a/man/openrc-run.8 b/man/openrc-run.8
index 603d2010e..3c9fc6f5f 100644
--- a/man/openrc-run.8
+++ b/man/openrc-run.8
@@ -209,6 +209,11 @@ Display name used for the above defined command.
 Process name to match when signaling the daemon.
 .It Ar stopsig
 Signal to send when stopping the daemon.
+If using
+.Xr supervise-daemon 8
+then using
+.Pa retry
+is preferred.
 .It Ar respawn_delay
 Respawn delay
 .Xr supervise-daemon 8
@@ -290,7 +295,7 @@ respawn_period::start:
 retry:stop:start:
 s6_log_arguments:::start
 secbits:start:start:
-stopsig:stop::stop
+stopsig:stop:start:stop
 supervise_daemon_args::start:
 timeout_down:::stop
 timeout_kill:::stop
diff --git a/sh/supervise-daemon.sh b/sh/supervise-daemon.sh
index f561e84dc..cdb5ef6f1 100644
--- a/sh/supervise-daemon.sh
+++ b/sh/supervise-daemon.sh
@@ -20,6 +20,14 @@ supervise_start()
 		return 1
 	fi
 
+	if [ -n "$stopsig" ]; then
+		if [ -z "$retry" ]; then
+			retry="$stopsig/5"
+		else
+			ewarn "Both \$retry and \$stopsig set, ignoring \$stopsig"
+		fi
+	fi
+
 	if [ -n "$ready" ]; then
 		ewarn "Use 'notify=$ready' instead of 'ready=$ready'"
 		notify="$ready"