diff --git a/packages/network/avahi/system.d/avahi-daemon.service b/packages/network/avahi/system.d/avahi-daemon.service
index 25d69cdec6..af5e8ee151 100644
--- a/packages/network/avahi/system.d/avahi-daemon.service
+++ b/packages/network/avahi/system.d/avahi-daemon.service
@@ -9,6 +9,7 @@ ConditionPathExists=/storage/.cache/services/avahi.conf
 EnvironmentFile=-/run/openelec/debug/avahi.conf
 ExecStart=/usr/sbin/avahi-daemon -s $AVAHI_DEBUG
 ExecReload=/usr/sbin/avahi-daemon -r
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/network/bluez/system.d/bluetooth.service b/packages/network/bluez/system.d/bluetooth.service
index 78f5be01b0..0c1c19f9c6 100644
--- a/packages/network/bluez/system.d/bluetooth.service
+++ b/packages/network/bluez/system.d/bluetooth.service
@@ -11,6 +11,7 @@ EnvironmentFile=-/run/openelec/debug/bluez.conf
 ExecStart=/usr/lib/bluetooth/bluetoothd $BLUEZ_ARGS $BLUEZ_DEBUG
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW
 LimitNPROC=1
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=bluetooth.target
diff --git a/packages/network/bluez/system.d/obex.service b/packages/network/bluez/system.d/obex.service
index 2ebffe880f..5a568d10c2 100644
--- a/packages/network/bluez/system.d/obex.service
+++ b/packages/network/bluez/system.d/obex.service
@@ -11,6 +11,7 @@ EnvironmentFile=/storage/.cache/services/obexd.conf
 EnvironmentFile=-/run/openelec/debug/obexd.conf
 ExecStartPre=/bin/sh -c 'mkdir -p $OBEXD_ROOT'
 ExecStart=/usr/lib/bluetooth/obexd -r $OBEXD_ROOT $OBEXD_DEBUG
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=bluetooth.target
diff --git a/packages/network/openssh/system.d/sshd.service b/packages/network/openssh/system.d/sshd.service
index b41aade5a1..d19b9971ae 100644
--- a/packages/network/openssh/system.d/sshd.service
+++ b/packages/network/openssh/system.d/sshd.service
@@ -9,6 +9,7 @@ EnvironmentFile=-/storage/.cache/services/sshd.conf
 ExecStartPre=/usr/sbin/sshd-keygen
 ExecStart=/usr/sbin/sshd -D $SSH_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/network/rpcbind/system.d/rpcbind.service b/packages/network/rpcbind/system.d/rpcbind.service
index 59464ee99e..13c0aa264c 100644
--- a/packages/network/rpcbind/system.d/rpcbind.service
+++ b/packages/network/rpcbind/system.d/rpcbind.service
@@ -6,6 +6,7 @@ After=syslog.target network.target
 [Service]
 Type=forking
 ExecStart=/usr/bin/rpcbind
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/network/samba/system.d.opt/nmbd.service b/packages/network/samba/system.d.opt/nmbd.service
index a4a48261d2..35711a0185 100644
--- a/packages/network/samba/system.d.opt/nmbd.service
+++ b/packages/network/samba/system.d.opt/nmbd.service
@@ -11,6 +11,7 @@ Type=forking
 PIDFile=/var/run/nmbd-smb.conf.pid
 ExecStart=/usr/bin/nmbd --configfile=/run/samba/smb.conf
 ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/network/samba/system.d.opt/smbd.service b/packages/network/samba/system.d.opt/smbd.service
index deb5aeccd6..6d8185ea10 100644
--- a/packages/network/samba/system.d.opt/smbd.service
+++ b/packages/network/samba/system.d.opt/smbd.service
@@ -12,6 +12,7 @@ PIDFile=/var/run/smbd-smb.conf.pid
 LimitNOFILE=16384
 ExecStart=/usr/bin/smbd --configfile=/run/samba/smb.conf
 ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/sysutils/busybox/system.d.opt/cron.service b/packages/sysutils/busybox/system.d.opt/cron.service
index 39a8edeedd..90fdd084ae 100644
--- a/packages/sysutils/busybox/system.d.opt/cron.service
+++ b/packages/sysutils/busybox/system.d.opt/cron.service
@@ -9,6 +9,7 @@ ConditionPathExists=/storage/.cache/services/crond.conf
 ExecStartPre=/bin/sh -c 'mkdir -p /storage/.cache/cron/crontabs'
 ExecStart=/sbin/crond -f -S
 KillMode=process
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/sysutils/remote/eventlircd/system.d/eventlircd.service b/packages/sysutils/remote/eventlircd/system.d/eventlircd.service
index f0ee23ecdd..100ca8852b 100644
--- a/packages/sysutils/remote/eventlircd/system.d/eventlircd.service
+++ b/packages/sysutils/remote/eventlircd/system.d/eventlircd.service
@@ -4,6 +4,7 @@ Description=Eventlirc server daemon
 [Service]
 ExecStart=/usr/sbin/eventlircd -f --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --release=_UP
 KillMode=process
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/x11/other/dwm/system.d/windowmanager.service b/packages/x11/other/dwm/system.d/windowmanager.service
index b662738721..d9afdcea39 100644
--- a/packages/x11/other/dwm/system.d/windowmanager.service
+++ b/packages/x11/other/dwm/system.d/windowmanager.service
@@ -11,6 +11,7 @@ KillMode=process
 Restart=always
 RestartSec=1
 StartLimitInterval=0
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=graphical.target
diff --git a/packages/x11/other/ratpoison/system.d/windowmanager.service b/packages/x11/other/ratpoison/system.d/windowmanager.service
index 3cfa6f011c..e2175655be 100644
--- a/packages/x11/other/ratpoison/system.d/windowmanager.service
+++ b/packages/x11/other/ratpoison/system.d/windowmanager.service
@@ -11,6 +11,7 @@ KillMode=process
 Restart=always
 RestartSec=1
 StartLimitInterval=0
+TimeoutStopSec=1s
 
 [Install]
 WantedBy=graphical.target