diff --git a/init.el b/init.el
index a49f33a74..f3a43d74a 100644
--- a/init.el
+++ b/init.el
@@ -70,7 +70,7 @@
         init-lisp              ; all things lisp; elisp, clojure
         ;; init-erlang
         ;; init-eshell
-        ;; init-go
+        init-go
         init-java              ; the poster child for carpal tunnel syndome
         init-js                ; alert("not java, javascript!")
         init-lua               ; zero-based indices? Zero-based indices.
diff --git a/init/init-go.el b/init/init-go.el
index 1fade870e..f940da5c7 100644
--- a/init/init-go.el
+++ b/init/init-go.el
@@ -1,8 +1,13 @@
-;; (use-package go-mode
-;;   :mode "\\.go\\'"
-;;   :interpreter "go"
-;;   :init
-;;   (require 'go-autocomplete))
+(use-package go-mode
+  :mode "\\.go$"
+  :interpreter "go"
+  :config
+  (progn
+    (bind 'normal go-mode-map "gd" 'godef-jump)
+
+    (use-package company-go
+      :config
+      (company--backend-on 'go-mode-hook 'company-go 'company-yasnippet))))
 
 
 (provide 'init-go)