diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 0832f10e3..c30440795 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1476,6 +1476,9 @@ eap_ikev2.so: ../src/eap_peer/eap_ikev2.c ../src/eap_peer/ikev2.c ../src/eap_com
 %.service: %.service.in
 	sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
 
+%@.service: %.service.arg.in
+	sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
+
 wpa_supplicant.exe: wpa_supplicant
 	mv -f $< $@
 wpa_cli.exe: wpa_cli
diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in
similarity index 100%
rename from wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
rename to wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in
diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in
similarity index 100%
rename from wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
rename to wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in
diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
similarity index 100%
rename from wpa_supplicant/systemd/wpa_supplicant@.service.in
rename to wpa_supplicant/systemd/wpa_supplicant.service.arg.in