diff --git a/data/control/movieplayer.end b/data/control/movieplayer.end
index d58c78279..1baa6ce60 100644
--- a/data/control/movieplayer.end
+++ b/data/control/movieplayer.end
@@ -1,4 +1,16 @@
 #!/bin/sh
 
-service tuxcald start
-service tuxmaild start
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0
diff --git a/data/control/movieplayer.start b/data/control/movieplayer.start
index baab37761..afa0f5f2a 100644
--- a/data/control/movieplayer.start
+++ b/data/control/movieplayer.start
@@ -1,4 +1,13 @@
 #!/bin/sh
 
-service tuxcald stop
-service tuxmaild stop
+# TuxMail sleep
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal sleep
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0
diff --git a/data/control/recording.end b/data/control/recording.end
index d58c78279..1baa6ce60 100644
--- a/data/control/recording.end
+++ b/data/control/recording.end
@@ -1,4 +1,16 @@
 #!/bin/sh
 
-service tuxcald start
-service tuxmaild start
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0
diff --git a/data/control/recording.start b/data/control/recording.start
index baab37761..afa0f5f2a 100644
--- a/data/control/recording.start
+++ b/data/control/recording.start
@@ -1,4 +1,13 @@
 #!/bin/sh
 
-service tuxcald stop
-service tuxmaild stop
+# TuxMail sleep
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal sleep
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0
diff --git a/data/control/standby.off b/data/control/standby.off
index d58c78279..1baa6ce60 100644
--- a/data/control/standby.off
+++ b/data/control/standby.off
@@ -1,4 +1,16 @@
 #!/bin/sh
 
-service tuxcald start
-service tuxmaild start
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0
diff --git a/data/control/standby.on b/data/control/standby.on
index baab37761..f77536215 100644
--- a/data/control/standby.on
+++ b/data/control/standby.on
@@ -1,4 +1,13 @@
 #!/bin/sh
 
-service tuxcald stop
-service tuxmaild stop
+# TuxMail pause
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal pause
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0