diff --git a/man/runscript.8 b/man/runscript.8
index 9439b766..77b23998 100644
--- a/man/runscript.8
+++ b/man/runscript.8
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd November 4, 2009
+.Dd December 31, 2011
 .Dt RUNSCRIPT 8 SMM
 .Os OpenRC
 .Sh NAME
@@ -112,6 +112,9 @@ List of arguments to pass to the daemon when starting.
 Pidfile to use for the above defined command.
 .It Ar name
 Display name used for the above defined command.
+.It Ar retry
+You can either specify a timeout in seconds or a multiple signal/timeout pairs
+as a stopping schedule. This is only used during stop().
 .El
 .Sh DEPENDENCIES
 You should define a
diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index b738b890..470f04c6 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -151,6 +151,7 @@ stop()
 	[ -n "$command" -o -n "$procname" -o -n "$pidfile" ] || return 0
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
 	start-stop-daemon --stop \
+		${retry:+--retry} $retry \
 		${command:+--exec} $command \
 		${procname:+--name} $procname \
 		${pidfile:+--pidfile} $pidfile \