diff --git a/modules/lang/go/README.md b/modules/lang/go/README.md
deleted file mode 100644
index c2421206d..000000000
--- a/modules/lang/go/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Go
-
-Go support, including auto-completion (gocode), eldoc support (go-eldoc), REPL
-support (gore), refactoring commands (gorename), syntax-checking (flycheck),
-auto-formatting (gofmt), and snippets (yasnippet).
-
-Snippets can be found in `private/hlissner/snippets/go-mode`.
-
-## External Dependencies
-
-Run `make bootstrap go` to install these.
-
-+ Go (`brew install go`, `pacman -S go`)
-+ gocode `go get -u github.com/nsf/gocode` (completion)
-+ gore `go get -u github.com/motemen/gore` (REPL)
-+ guru `golang.org/x/tools/cmd/guru` (code navigation commands)
-+ gorename `golang.org/x/tools/cmd/gorename` (refactoring commands)
-
diff --git a/modules/lang/go/README.org b/modules/lang/go/README.org
new file mode 100644
index 000000000..580625358
--- /dev/null
+++ b/modules/lang/go/README.org
@@ -0,0 +1,37 @@
+* Go
+
+Go support, including auto-completion, eldoc support (go-eldoc), REPL support,
+refactoring commands, syntax-checking (flycheck), auto-formatting (gofmt) and
+snippets (yasnippet).
+
++ [[https://golang.org][Homepage]]
++ [[../../modules/private/hlissner/snippets/go-mode][Snippets]]
++ [[../../modules/feature/file-templates/templates/go-mode][File templates]]
+
+** Installation
+*** MacOS
+#+BEGIN_SRC sh :results output
+brew install go
+#+END_SRC
+
+*** Arch Linux
+#+BEGIN_SRC sh :dir /sudo:: :results output
+pacman --needed --noconfirm -S go
+#+END_SRC
+
+** Dependencies
+You'll need to set up ~GOPATH~. This is mine:
+
+#+BEGIN_SRC sh
+export GOPATH=~/.go
+#+END_SRC
+
+Then install the necessary packages:
+
+#+BEGIN_SRC sh :results output
+go get -u github.com/nsf/gocode            # completion
+go get -u github.com/motemen/gore          # REPL
+go get -u golang.org/x/tools/cmd/guru      # code navigation commands
+go get -u golang.org/x/tools/cmd/gorename  # refactoring commands
+#+END_SRC
+