diff --git a/Python/etc/monit/services b/Python/etc/monit/services
index 831b362..507d2b8 100644
--- a/Python/etc/monit/services
+++ b/Python/etc/monit/services
@@ -160,10 +160,12 @@ service("syslog-ng",
         extra=["depend on file/var/log/syslog"])
 
 service("ups-monitor",
+        name="upsmon",
+        pidf="nut/upsmon")
+
+service("ups-server",
         name="upsd",
-        pidf="nut/upsd",
-        start_cmd="/sbin/upsd",
-        stop_cmd='/usr/bin/killall upsd')
+        pidf="nut/upsd")
 
 if has('adm-only'):
     vsftpd_ip = admip()