diff --git a/bin/bootstrap-caskroom b/bin/bootstrap-caskroom
index 9af2861..82a6154 100755
--- a/bin/bootstrap-caskroom
+++ b/bin/bootstrap-caskroom
@@ -41,6 +41,7 @@ main() {
     betterzip
     betterzipql
     caskroom/drivers/logitech-options
+    emacs
     firefox
     fluid
     flux
diff --git a/shell/golang.sh b/shell/golang.sh
index 1d8af0b..be730c4 100755
--- a/shell/golang.sh
+++ b/shell/golang.sh
@@ -40,6 +40,7 @@ install_go_global_packages () {
     github.com/rogpeppe/godef
     github.com/tools/godep
     github.com/vektra/mockery/.../
+    golang.org/x/tools/cmd/godoc
     golang.org/x/tools/cmd/goimports
     golang.org/x/tools/cmd/gorename
     golang.org/x/tools/cmd/guru