Index: apcupsd-3.14.0/platforms/apccontrol.in
===================================================================
--- apcupsd-3.14.0.orig/platforms/apccontrol.in
+++ apcupsd-3.14.0/platforms/apccontrol.in
@@ -18,7 +18,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 
-APCPID=@PIDDIR@/apcupsd.pid
+SERVICE=${SERVICE-apcupsd}
 APCUPSD=@sbindir@/apcupsd
 SHUTDOWN=@SHUTDOWN@
 SCRIPTSHELL=@SCRIPTSHELL@
@@ -120,15 +120,7 @@ case "$1" in
 	echo "Remote Shutdown. Beginning Shutdown Sequence." | ${WALL}
     ;;
     restartme)
-	echo -n "Restarting APCUPSD Power Management: "
-	THEPID=`cat ${APCPID}`
-	kill ${THEPID}
-	rm -f ${APCPID}
-	rm -f @PWRFAILDIR@/powerfail
-	rm -f @nologdir@/nologin
-	sleep 5
-	`${APCUPSD}`
-	echo "apcupsd"
+	/etc/init.d/${SERVICE} restart
     ;;
     startselftest)
     ;;