diff --git a/src/packages/gfm.tmbundle/Syntaxes/gfm.cson b/src/packages/gfm.tmbundle/Syntaxes/gfm.cson
index 6ffbefdc5..084cba010 100644
--- a/src/packages/gfm.tmbundle/Syntaxes/gfm.cson
+++ b/src/packages/gfm.tmbundle/Syntaxes/gfm.cson
@@ -44,4 +44,10 @@
       '2':
         'name': 'markup.underline.gfm'
   }
+  {
+    'match': '^\\s*(\\*)\\s+'
+    'captures':
+      '1':
+        'name': 'constant.gfm'
+  }
 ]
diff --git a/src/packages/gfm.tmbundle/spec/gfm-spec.coffee b/src/packages/gfm.tmbundle/spec/gfm-spec.coffee
index 28057169f..2a67ff044 100644
--- a/src/packages/gfm.tmbundle/spec/gfm-spec.coffee
+++ b/src/packages/gfm.tmbundle/spec/gfm-spec.coffee
@@ -58,3 +58,10 @@ describe "GitHub Flavored Markdown grammar", ->
     expect(tokens[3]).toEqual value: "](", scopes: ["source.gfm"]
     expect(tokens[4]).toEqual value: "website", scopes: ["source.gfm", "markup.underline.gfm"]
     expect(tokens[5]).toEqual value: ")", scopes: ["source.gfm"]
+
+  it "tokenizes lists", ->
+    {tokens} = grammar.tokenizeLine("  * Item 1")
+    expect(tokens[0]).toEqual value: "  ", scopes: ["source.gfm"]
+    expect(tokens[1]).toEqual value: "*", scopes: ["source.gfm", "constant.gfm"]
+    expect(tokens[2]).toEqual value: " ", scopes: ["source.gfm"]
+    expect(tokens[3]).toEqual value: "Item 1", scopes: ["source.gfm"]