diff --git a/go-mode.el b/go-mode.el
index cde0b72d..3881097d 100644
--- a/go-mode.el
+++ b/go-mode.el
@@ -386,8 +386,7 @@ For mode=set, all covered lines will have this weight."
     (modify-syntax-entry ?\' "\"" st)
     (modify-syntax-entry ?`  "\"" st)
     (modify-syntax-entry ?\\ "\\" st)
-    ;; TODO make _ a symbol constituent now that xemacs is gone
-    (modify-syntax-entry ?_  "w" st)
+    (modify-syntax-entry ?_  "_" st)
 
     st)
   "Syntax table for Go mode.")