diff --git a/share/completions/wpa_cli.fish b/share/completions/wpa_cli.fish
new file mode 100644
index 000000000..550cf0cde
--- /dev/null
+++ b/share/completions/wpa_cli.fish
@@ -0,0 +1,39 @@
+
+#completions for wpa_cli
+complete -x -c wpa_cli -a status -d (N_ 'get current WPA/EAPOL/EAP status')
+complete -x -c wpa_cli -a mib -d (N_ 'get MIB variables (dot1x, dot11)')
+complete -x -c wpa_cli -a help -d (N_ 'show this usage help')
+complete -x -c wpa_cli -a interface -d (N_ 'show interfaces/select interface')
+complete -x -c wpa_cli -a level -d (N_ 'change debug level')
+complete -x -c wpa_cli -a license -d (N_ 'show full wpa_cli license')
+complete -x -c wpa_cli -a logoff -d (N_ 'IEEE 802.1X EAPOL state machine logoff')
+complete -x -c wpa_cli -a logon -d (N_ 'IEEE 802.1X EAPOL state machine logon')
+complete -x -c wpa_cli -a set -d (N_ 'set/list variables')
+complete -x -c wpa_cli -a pmksa -d (N_ 'show PMKSA cache')
+complete -x -c wpa_cli -a reassociate -d (N_ 'force reassociation')
+complete -x -c wpa_cli -a reconfigure -d (N_ 'force wpa_supplicant to re-read its config file')
+complete -x -c wpa_cli -a preauthenticate -d (N_ 'force preauthentication')
+complete -x -c wpa_cli -a identity -d (N_ 'configure identity for an SSID')
+complete -x -c wpa_cli -a password -d (N_ 'configure password for an SSID')
+complete -x -c wpa_cli -a new_password -d (N_ 'change password for an SSID')
+complete -x -c wpa_cli -a pin -d (N_ 'configure pin for an SSID')
+complete -x -c wpa_cli -a otp -d (N_ 'configure one-time-password for an SSID')
+complete -x -c wpa_cli -a passphrase -d (N_ 'configure private key passphrase for an SSID')
+complete -x -c wpa_cli -a bssid -d (N_ 'set preferred BSSID for an SSID')
+complete -x -c wpa_cli -a list_networks -d (N_ 'list configured networks')
+complete -x -c wpa_cli -a select_network -d (N_ 'select a network (disable others)')
+complete -x -c wpa_cli -a enable_network -d (N_ 'enable a network')
+complete -x -c wpa_cli -a disable_network -d (N_ 'disable a network')
+complete -x -c wpa_cli -a add_network -d (N_ 'add a network')
+complete -x -c wpa_cli -a remove_network -d (N_ 'remove a network')
+complete -x -c wpa_cli -a set_network -d (N_ 'set/list network variables')
+complete -x -c wpa_cli -a get_network -d (N_ 'get network variables')
+complete -x -c wpa_cli -a save_config -d (N_ 'save the current configuration')
+complete -x -c wpa_cli -a disconnect -d (N_ 'disconnect and wait for reassociate command before connecting')
+complete -x -c wpa_cli -a scan -d (N_ 'request new BSS scan')
+complete -x -c wpa_cli -a scan_results -d (N_ 'get latest scan results')
+complete -x -c wpa_cli -a get_capability -d (N_ 'get capabilies')
+complete -x -c wpa_cli -a stakey-request -d (N_ 'request STAKey negotiation with <addr>')
+complete -x -c wpa_cli -a ap_scan -d (N_ 'set ap_scan parameter')
+complete -x -c wpa_cli -a stkstart -d (N_ 'request STK negotiation with <addr>')
+complete -x -c wpa_cli -a terminate -d (N_ 'terminate wpa_supplicant')