diff --git a/general/package/majestic/files/S95majestic b/general/package/majestic/files/S95majestic
index bef48e2c41..b8aef8ddf6 100755
--- a/general/package/majestic/files/S95majestic
+++ b/general/package/majestic/files/S95majestic
@@ -1,30 +1,31 @@
 #!/bin/sh
 
-DAEMON="majestic"
-PIDFILE="/var/run/$DAEMON.pid"
+DAEMON="/usr/bin/majestic"
 DAEMON_ARGS="-s"
 
 start() {
 	echo -n "Starting $DAEMON: "
-	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS
-	if [ $? -eq 0 ]; then
-		echo "OK"
-	else
-		echo "FAIL"
-	fi
+	start-stop-daemon -b -S -q -x "$DAEMON" -- $DAEMON_ARGS
+	case $? in
+		0) echo "OK" ;;
+		1) echo "FAIL (already running)" ;;
+		*) echo "FAIL" ;;
+	esac
 }
 
 stop() {
 	echo -n "Stopping $DAEMON: "
-	start-stop-daemon -K -q -p "$PIDFILE"
-	if [ $? -eq 0 ]; then
-		rm -f "$PIDFILE"
+	if start-stop-daemon -K -q -x "$DAEMON"; then
 		echo "OK"
 	else
 		echo "FAIL"
 	fi
 }
 
+reload() {
+	start-stop-daemon -K -s 1 -q -x "$DAEMON"
+}
+
 case "$1" in
 	start|stop)
 		$1
@@ -37,7 +38,7 @@ case "$1" in
 		;;
 
 	reload)
-		killall -1 "$DAEMON"
+		reload
 		;;
 
 	*)