--- nut-2.6.4/scripts/systemd/nut-server.service.in.orig	2012-06-23 23:05:33.638939671 +0200
+++ nut-2.6.4/scripts/systemd/nut-server.service.in	2012-06-23 23:13:37.038936168 +0200
@@ -5,7 +5,8 @@
 Before=nut-monitor.service
 
 [Service]
-ExecStart=@SBINDIR@/upsd 
+EnvironmentFile=-/etc/sysconfig/ups
+ExecStart=@SBINDIR@/upsd $UPSD_OPTIONS
 Type=forking
 
 [Install]
--- nut-2.6.4/scripts/systemd/nut-monitor.service.in.orig	2012-05-02 23:35:36.000000000 +0200
+++ nut-2.6.4/scripts/systemd/nut-monitor.service.in	2012-06-23 23:14:10.582269261 +0200
@@ -3,7 +3,8 @@
 After=local-fs.target network.target nut-server.service
 
 [Service]
-ExecStart=@SBINDIR@/upsmon
+EnvironmentFile=-/etc/sysconfig/upsmon
+ExecStart=@SBINDIR@/upsmon $PROGRAM_ARGS
 PIDFile=@PIDPATH@/upsmon.pid
 Type=forking
 
--- nut-2.6.5/configure.in~	2012-08-06 14:37:36.000000000 +0200
+++ nut-2.6.5/configure.in	2013-01-13 12:42:30.807862312 +0100
@@ -986,9 +986,8 @@
 dnl prefix. This is needed for 'distcheck*' targets, otherwise
 dnl files will try to get intalled to the actual system directories
 if test -n "${systemdsystemunitdir}"; then
-	systemdsystemshutdowndir="${libdir}/systemd/system-shutdown"
+	systemdsystemshutdowndir="/lib/systemd/system-shutdown"
 	AC_MSG_RESULT(using ${systemdsystemunitdir})
-	systemdsystemunitdir="`echo ${systemdsystemunitdir} | sed 's/\/lib/\${libdir}/'`"
 else
 	AC_MSG_RESULT(no)
 fi