diff --git a/wpa_supplicant/wpa_supplicant.nsi b/wpa_supplicant/wpa_supplicant.nsi
index 604f71135..27761bda0 100644
--- a/wpa_supplicant/wpa_supplicant.nsi
+++ b/wpa_supplicant/wpa_supplicant.nsi
@@ -45,6 +45,8 @@ section
 		"DisplayName" "wpa_supplicant"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\wpa_supplicant" \
 		"UninstallString" "$INSTDIR\uninstall.exe"
+
+	ExecWait "$INSTDIR\wpasvc.exe reg"
 sectionEnd
 
 
@@ -52,6 +54,8 @@ section "uninstall"
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\wpa_supplicant"
 	delete "$INSTDIR\uninstall.exe"
 
+	ExecWait "$INSTDIR\wpasvc.exe unreg"
+
 	delete "$INSTDIR\wpa_gui.exe"
 	delete "$INSTDIR\wpa_cli.exe"
 	delete "$INSTDIR\COPYING"