diff --git a/share/completions/goimports.fish b/share/completions/goimports.fish
new file mode 100644
index 000000000..b0b568c96
--- /dev/null
+++ b/share/completions/goimports.fish
@@ -0,0 +1,6 @@
+complete -c goimports -s d -d "Display diffs instead of rewriting files"
+complete -c goimports -s e -d "Report all errors"
+complete -c goimports -s l -d "List files whose formatting differs from goimport's"
+complete -c goimports -l srcdir -o srcdir -r -d "Choose imports as if source code is from dir"
+complete -c goimports -s w -d "Write result to (source) file instead of stdout"
+