diff --git a/.gitattributes b/.gitattributes
index 97da3389fb..07953cae39 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,10 @@
-# see golang.org/issue/9281
-* eol=lf
+# Treat all files in the Go repo as binary, with no git magic updating
+# line endings. Windows users contributing to Go will need to use a
+# modern version of git and editors capable of LF line endings.
+#
+# We'll prevent accidental CRLF line endings from entering the repo
+# via the git-review gofmt checks.
+#
+# See golang.org/issue/9281
+
+* -text