diff --git a/debian/changelog b/debian/changelog
index 57bbfb4..277cc98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+g15daemon (1.9.5.2-2) unstable; urgency=low
+
+  * Handle better errors in the init.d script (Closes: #463073)
+
+ -- Giacomo Catenazzi <cate@debian.org>  Tue, 29 Jan 2008 20:15:35 +0100
+
 g15daemon (1.9.5.2-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/g15daemon.init b/debian/g15daemon.init
index 662f474..b40bb0b 100644
--- a/debian/g15daemon.init
+++ b/debian/g15daemon.init
@@ -42,7 +42,7 @@ case "$1" in
 	echo -n "Stopping $DESC: "
 	$DAEMON -k
 	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
+		--oknodo --retry 5 --exec $DAEMON
 	echo "$NAME."
 	;;
   #reload)