diff --git a/plugins/adb/README.md b/plugins/adb/README.md
index 075beec0..83dcc728 100644
--- a/plugins/adb/README.md
+++ b/plugins/adb/README.md
@@ -1,7 +1,7 @@
 # adb autocomplete plugin
 
 * Adds autocomplete options for all adb commands.
-
+* Add autocomplete for `adb -s`
 
 ## Requirements
 
diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index 5f37beda..2e3c3658 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -43,11 +43,20 @@ local expl
 local -a pkgs installed_pkgs
 
 _arguments \
+	'-s[devices]:specify device:->specify_device' \
 	'*:: :->subcmds' && return 0
 
+case "$state" in
+	specify_device)
+	_values  'devices' $(adb devices|awk 'NR>1&& $1 ~ /^[a-zA-Z0-9].*$/ \
+		{printf "%s[Device_%d:%s] ",$1,++i,$2 }')
+	return
+	;;
+esac
+
 if (( CURRENT == 1 )); then
 	_describe -t commands "adb subcommand" _1st_arguments
 	return
 fi
 
-_files
+_files
\ No newline at end of file