diff --git a/package/optware/S50smartdns b/package/optware/S50smartdns
index 88157d8..f594b21 100644
--- a/package/optware/S50smartdns
+++ b/package/optware/S50smartdns
@@ -339,7 +339,7 @@ case "$1" in
 		SLEEP="sleep"
 		SLEEPTIME=0.2
 	fi
-	N=30
+	N=300
 	while [ $N -gt 0 ]
 	do
 		pid="$(cat "$SMARTDNS_PID" | head -n 1 2>/dev/null)"
diff --git a/systemd/smartdns.service.in b/systemd/smartdns.service.in
index b0c5db3..e8dcbc0 100644
--- a/systemd/smartdns.service.in
+++ b/systemd/smartdns.service.in
@@ -11,7 +11,7 @@ EnvironmentFile=@SYSCONFDIR@/default/smartdns
 ExecStart=@SBINDIR@/smartdns -p @RUNSTATEDIR@/smartdns.pid $SMART_DNS_OPTS 
 Restart=always
 RestartSec=2
-TimeoutStopSec=5
+TimeoutStopSec=15
 
 [Install]
 WantedBy=multi-user.target