diff --git a/Syntaxes/Go.tmLanguage b/Syntaxes/Go.tmLanguage
index 2e7c704..cf2f20e 100644
--- a/Syntaxes/Go.tmLanguage
+++ b/Syntaxes/Go.tmLanguage
@@ -513,7 +513,7 @@
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b</string>
+					<string>(\b|\.)((0(x|X)[0-9a-fA-F_]*)|(0(o|O)[0-7_]*)|(0(b|B)[01_]*)|(([0-9_]+\.?[0-9_]*)|([0-9_]*\.?[0-9_]+))((e|E)(\+|-)?[0-9_]*)?i?)</string>
 					<key>name</key>
 					<string>constant.numeric.go</string>
 				</dict>