2 files changed, 19 insertions, 0 deletions
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index c254f6547..756ccec74 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -77,6 +77,7 @@ _global
 _gnu_generic
 _gnupod
 _gnutls
+_go
 _gpg
 _gphoto2
 _gprof
diff --git a/Completion/Unix/Command/_go b/Completion/Unix/Command/_go
new file mode 100644
index 000000000..c48cc51e4
--- /dev/null
+++ b/Completion/Unix/Command/_go
@@ -0,0 +1,18 @@
+#compdef gccgo gofmt 5l 6l 8l 5g 6g 8g
+
+# This is for the computer language go,
+# http://glolang.org.
+
+local expl pat
+
+case $service in
+  (<->l)
+  pat="*.${service[1,-2]}"
+  ;;
+
+  (*)
+  pat="*.go"
+  ;;
+esac
+
+_wanted files expl "input file" _files -g "$pat"