--- a/systemd/upmpdcli.service
+++ b/systemd/upmpdcli.service
@@ -1,10 +1,16 @@
 [Unit]
-Description=fast remote file copy program daemon
-ConditionPathExists=/etc/rsyncd.conf
+Description=UPnP Renderer front-end to MPD
+After=syslog.target
 
 [Service]
-EnvironmentFile=/etc/sysconfig/rsyncd
-ExecStart=/usr/bin/rsync --daemon --no-detach "$OPTIONS"
+Type=simple
+# Note: if start fails check with "systemctl status upmpdcli"
+ExecStart=/usr/bin/upmpdcli -c /etc/upmpdcli.conf
+# For some reason, the first start of libupnp fails. Probably this should
+# be started later in the start sequence, but I don't know how. Retry a bit
+# later. 
+Restart=always
+RestartSec=1min
 
 [Install]
 WantedBy=multi-user.target