diff --git a/plugins/s2i/README.md b/plugins/s2i/README.md
new file mode 100644
index 000000000..6982ad020
--- /dev/null
+++ b/plugins/s2i/README.md
@@ -0,0 +1,9 @@
+# s2i
+
+This plugin provides completion for [s2i](https://github.com/openshift/source-to-image).
+
+To use it, add `s2i` to the plugins array in your .zshrc file.
+
+```
+plugins=(... s2i)
+```
diff --git a/plugins/s2i/s2i.plugin.zsh b/plugins/s2i/s2i.plugin.zsh
new file mode 100644
index 000000000..5405dbbed
--- /dev/null
+++ b/plugins/s2i/s2i.plugin.zsh
@@ -0,0 +1,5 @@
+# Autocompletion plugin for [s2i](https://github.com/openshift/source-to-image).
+
+if [ $commands[s2i] ]; then
+  source <(s2i completion zsh)
+fi