diff --git a/plugins/gatsby/README.md b/plugins/gatsby/README.md
new file mode 100644
index 000000000..36846a228
--- /dev/null
+++ b/plugins/gatsby/README.md
@@ -0,0 +1,7 @@
+# gatsby autocomplete plugin
+
+* Adds autocomplete options for all gatsby commands.
+
+## Requirements
+
+In order to make this work, you will need to have gatsby set up in your path.
diff --git a/plugins/gatsby/_gatsby b/plugins/gatsby/_gatsby
new file mode 100644
index 000000000..66eb02f00
--- /dev/null
+++ b/plugins/gatsby/_gatsby
@@ -0,0 +1,24 @@
+#compdef gatsby
+#autoload
+
+# in order to make this work, you will need to have gatsby
+# https://www.gatsbyjs.org/
+
+local -a _1st_arguments
+_1st_arguments=(
+'develop:Start development server. Watches files, rebuilds, and hot reloads if something changes'
+'build:Build a Gatsby project.'
+'serve:Serve previously built Gatsby site.'
+'info:Get environment information for debugging and issue reporting'
+'clean:Wipe the local gatsby environment including built assets and cache'
+'repl:Get a node repl with context of Gatsby environment, see (add docs link here)'
+'new: [rootPath] [starter]  Create new Gatsby project.'
+'telemetry:Enable or disable Gatsby anonymous analytics collection.'
+)
+
+_arguments -C '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+    _describe -t commands "gatsby subcommand" _1st_arguments
+    return
+fi