diff --git a/grammars/javascript.cson b/grammars/javascript.cson
index 147a7b80..003b36e8 100644
--- a/grammars/javascript.cson
+++ b/grammars/javascript.cson
@@ -1244,15 +1244,15 @@
   'numbers':
     'patterns': [
       {
-        'match': '\\b(?<!\\$)0(x|X)[0-9a-fA-F]+\\b(?!\\$)'
+        'match': '\\b(?<!\\$)0(x|X)[0-9a-fA-F]+n?\\b(?!\\$)'
         'name': 'constant.numeric.hex.js'
       }
       {
-        'match': '\\b(?<!\\$)0(b|B)[01]+\\b(?!\\$)'
+        'match': '\\b(?<!\\$)0(b|B)[01]+n?\\b(?!\\$)'
         'name': 'constant.numeric.binary.js'
       }
       {
-        'match': '\\b(?<!\\$)0(o|O)?[0-7]+\\b(?!\\$)'
+        'match': '\\b(?<!\\$)0(o|O)?[0-7]+n?\\b(?!\\$)'
         'name': 'constant.numeric.octal.js'
       }
       {
@@ -1265,7 +1265,7 @@
             (?:\\b[0-9]+(\\.)[0-9]+\\b)|                # 1.1
             (?:\\b[0-9]+(\\.)\\B)|                      # 1.
             (?:\\B(\\.)[0-9]+\\b)|                      # .1
-            (?:\\b[0-9]+\\b(?!\\.))                     # 1
+            (?:\\b[0-9]+n?\\b(?!\\.))                   # 1n
           )(?!\\$)
         '''
         'captures':
diff --git a/spec/javascript-spec.coffee b/spec/javascript-spec.coffee
index b23d5bc0..edb90605 100644
--- a/spec/javascript-spec.coffee
+++ b/spec/javascript-spec.coffee
@@ -316,6 +316,12 @@ describe "JavaScript grammar", ->
       {tokens} = grammar.tokenizeLine('0X1D306')
       expect(tokens[0]).toEqual value: '0X1D306', scopes: ['source.js', 'constant.numeric.hex.js']
 
+      {tokens} = grammar.tokenizeLine('0x1D306n')
+      expect(tokens[0]).toEqual value: '0x1D306n', scopes: ['source.js', 'constant.numeric.hex.js']
+
+      {tokens} = grammar.tokenizeLine('0X1D306n')
+      expect(tokens[0]).toEqual value: '0X1D306n', scopes: ['source.js', 'constant.numeric.hex.js']
+
     it "tokenizes binary literals", ->
       {tokens} = grammar.tokenizeLine('0b011101110111010001100110')
       expect(tokens[0]).toEqual value: '0b011101110111010001100110', scopes: ['source.js', 'constant.numeric.binary.js']
@@ -323,6 +329,12 @@ describe "JavaScript grammar", ->
       {tokens} = grammar.tokenizeLine('0B011101110111010001100110')
       expect(tokens[0]).toEqual value: '0B011101110111010001100110', scopes: ['source.js', 'constant.numeric.binary.js']
 
+      {tokens} = grammar.tokenizeLine('0b011101110111010001100110n')
+      expect(tokens[0]).toEqual value: '0b011101110111010001100110n', scopes: ['source.js', 'constant.numeric.binary.js']
+
+      {tokens} = grammar.tokenizeLine('0B011101110111010001100110n')
+      expect(tokens[0]).toEqual value: '0B011101110111010001100110n', scopes: ['source.js', 'constant.numeric.binary.js']
+
     it "tokenizes octal literals", ->
       {tokens} = grammar.tokenizeLine('0o1411')
       expect(tokens[0]).toEqual value: '0o1411', scopes: ['source.js', 'constant.numeric.octal.js']
@@ -330,6 +342,12 @@ describe "JavaScript grammar", ->
       {tokens} = grammar.tokenizeLine('0O1411')
       expect(tokens[0]).toEqual value: '0O1411', scopes: ['source.js', 'constant.numeric.octal.js']
 
+      {tokens} = grammar.tokenizeLine('0o1411n')
+      expect(tokens[0]).toEqual value: '0o1411n', scopes: ['source.js', 'constant.numeric.octal.js']
+
+      {tokens} = grammar.tokenizeLine('0O1411n')
+      expect(tokens[0]).toEqual value: '0O1411n', scopes: ['source.js', 'constant.numeric.octal.js']
+
       {tokens} = grammar.tokenizeLine('0010')
       expect(tokens[0]).toEqual value: '0010', scopes: ['source.js', 'constant.numeric.octal.js']
 
@@ -337,6 +355,9 @@ describe "JavaScript grammar", ->
       {tokens} = grammar.tokenizeLine('1234')
       expect(tokens[0]).toEqual value: '1234', scopes: ['source.js', 'constant.numeric.decimal.js']
 
+      {tokens} = grammar.tokenizeLine('123456789n')
+      expect(tokens[0]).toEqual value: '123456789n', scopes: ['source.js', 'constant.numeric.decimal.js']
+
       {tokens} = grammar.tokenizeLine('5e-10')
       expect(tokens[0]).toEqual value: '5e-10', scopes: ['source.js', 'constant.numeric.decimal.js']