diff --git a/completion/README.md b/completion/README.md
index dee63db73..c0e8c9133 100644
--- a/completion/README.md
+++ b/completion/README.md
@@ -14,3 +14,7 @@ Add `eval "$(gulp --completion=zsh)"` to `~/.zshrc`.
 ## Powershell
 
 Add `Invoke-Expression ((gulp --completion=powershell) -join [System.Environment]::NewLine)` to `$PROFILE`.
+
+## Fish
+
+Add `gulp --completion=fish | source` to `~/.config/fish/config.fish`.
diff --git a/completion/fish b/completion/fish
new file mode 100644
index 000000000..f27f2248b
--- /dev/null
+++ b/completion/fish
@@ -0,0 +1,10 @@
+#!/usr/bin/env fish
+
+# Usage:
+#
+# To enable fish <tab> completion for gulp, add the following line to
+# your ~/.config/fish/config.fish file:
+#
+# gulp --completion=fish | source
+
+complete -c gulp -a "(gulp --tasks-simple)" -f