diff --git a/grammars/rust.cson b/grammars/rust.cson
index 1050618..1b05944 100644
--- a/grammars/rust.cson
+++ b/grammars/rust.cson
@@ -241,12 +241,12 @@
   {
     'comment': 'Control keyword'
     'name': 'keyword.control.rust'
-    'match': '\\b(break|continue|else|if|in|for|loop|match|return|while)\\b'
+    'match': '\\b(break|continue|do catch|else|if|in|for|loop|match|return|while)\\b'
   }
   {
     'comment': 'Keyword'
     'name': 'keyword.other.rust'
-    'match': '\\b(crate|extern|mod|let|proc|ref|use|super|as|move)\\b'
+    'match': '\\b(crate|do|extern|mod|let|proc|ref|use|super|as|move)\\b'
   }
   { 'include': '#unsafe' }
   { 'include': '#sigils' }
diff --git a/spec/rust-spec.coffee b/spec/rust-spec.coffee
index a10d885..c45d5d8 100644
--- a/spec/rust-spec.coffee
+++ b/spec/rust-spec.coffee
@@ -294,14 +294,14 @@ describe 'Rust grammar', ->
   #
 
   it 'tokenizes control keywords', ->
-    for t in ['break', 'continue', 'else', 'if', 'in', 'for', 'loop', 'match', 'return', 'while']
+    for t in ['break', 'continue', 'do catch', 'else', 'if', 'in', 'for', 'loop', 'match', 'return', 'while']
       {tokens} = grammar.tokenizeLine("text #{t} text")
       expect(tokens[0]).toEqual value: 'text ', scopes: ['source.rust']
       expect(tokens[1]).toEqual value: t, scopes: ['source.rust', 'keyword.control.rust']
       expect(tokens[2]).toEqual value: ' text', scopes: ['source.rust']
 
   it 'tokenizes keywords', ->
-    for t in ['crate', 'extern', 'mod', 'let', 'proc', 'ref', 'use', 'super', 'as', 'move']
+    for t in ['crate', 'do', 'extern', 'mod', 'let', 'proc', 'ref', 'use', 'super', 'as', 'move']
       {tokens} = grammar.tokenizeLine("text #{t} text")
       expect(tokens[0]).toEqual value: 'text ', scopes: ['source.rust']
       expect(tokens[1]).toEqual value: t, scopes: ['source.rust', 'keyword.other.rust']
@@ -630,3 +630,7 @@ describe 'Rust grammar', ->
     expect(tokens[8][0]).toEqual value: '_a0', scopes: ['source.rust', 'entity.name.function.rust']
     expect(tokens[9][0]).toEqual value: '_0a', scopes: ['source.rust', 'entity.name.function.rust']
     expect(tokens[10][0]).toEqual value: '__', scopes: ['source.rust', 'entity.name.function.rust']
+
+  it 'tokenizes sole catch as text', ->
+    {tokens} = grammar.tokenizeLine('catch')
+    expect(tokens[0]).toEqual value: 'catch', scopes: ['source.rust']