diff --git a/emacs b/emacs
index 9804b88..d773eb7 100644
--- a/emacs
+++ b/emacs
@@ -77,12 +77,13 @@
                           (require 'auto-complete-config)
                           (load-file "/Users/brettlangdon/go/src/code.google.com/p/go.tools/cmd/oracle/oracle.el")
                           (go-oracle-mode)
+                          (load-file "~/go/src/github.com/golang/lint/misc/emacs/golint.el")
+                          (require 'golint)
                           (setq gofmt-command "goimports")
                           (local-set-key (kbd "M-.") 'godef-jump)
                           (add-hook 'before-save-hook #'gofmt-before-save)))
 (add-hook 'js-mode-hook (lambda()
                           (flymake-jslint-load)
-                          (flymake-cursor-mode)
                           (setq js2-include-node-externs t)
                           (setq js2-highlight-level 3)
                           (setq js2-mode-show-parse-errors nil)