diff --git a/Completion/Zsh/Type/_options_set b/Completion/Zsh/Type/_options_set
new file mode 100644
index 000000000..6082909fd
--- /dev/null
+++ b/Completion/Zsh/Type/_options_set
@@ -0,0 +1,10 @@
+#autoload
+
+# Complete all set options. This relies on `_main_complete' to store the
+# names of the options that were set when it was called in the array
+# `_options_set'.
+
+local expl
+
+_wanted zsh-options expl 'set zsh option' \
+    compadd "$@" -M 'B:[nN][oO]= M:_= M:{A-Z}={a-z}' -a _options_set