diff --git a/data/Makefile.am b/data/Makefile.am
index 5a95ea2..fc36b9f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,10 +25,6 @@ service_DATA = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
 	$(edit) $< >$@
-
-install-exec-local:
-	install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
-	ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
 endif
 
 examplesdir = $(docdir)/examples
diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in
index 6ad6942..1753d20 100644
--- a/data/NetworkManager-wait-online.service.in
+++ b/data/NetworkManager-wait-online.service.in
@@ -1,13 +1,14 @@
 [Unit]
 Description=Network Manager Wait Online
+Documentation=man:nm-online(1)
 Requisite=NetworkManager.service
 After=NetworkManager.service
-Wants=network.target
-Before=network.target network-online.target
+Before=network-online.target
 
 [Service]
 Type=oneshot
 ExecStart=@bindir@/nm-online -s -q --timeout=30
+RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=network-online.target
