diff --git a/README.md b/README.md
index 16aef33..7b08320 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Windows Build Status](https://ci.appveyor.com/api/projects/status/gcgb9m7h146lv6qp/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/language-todo/branch/master)
 [![Dependency Status](https://david-dm.org/atom/language-todo.svg)](https://david-dm.org/atom/language-todo)
 
-Adds syntax highlighting to `TODO`, `FIXME`, `CHANGED`, `XXX`, `IDEA`, `HACK`, `NOTE`, `REVIEW`, `NB` and `BUG` in comments
+Adds syntax highlighting to `TODO`, `FIXME`, `CHANGED`, `XXX`, `IDEA`, `HACK`, `NOTE`, `REVIEW`, `NB`, `BUG` and `REMOVE` in comments
 and text in Atom.
 
 Originally [converted](http://flight-manual.atom.io/hacking-atom/sections/converting-from-textmate) from the [TODO TextMate bundle](https://github.com/textmate/todo.tmbundle).
diff --git a/grammars/todo.cson b/grammars/todo.cson
index 24add53..0f1b5b3 100644
--- a/grammars/todo.cson
+++ b/grammars/todo.cson
@@ -3,7 +3,7 @@
 'injectionSelector': 'comment, text.plain'
 'patterns': [
   {
-    'match': '(?<!\\w)@?(TODO|FIXME|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG|QUESTION|COMBAK|TEMP)\\b'
+    'match': '(?<!\\w)@?(TODO|FIXME|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG|QUESTION|COMBAK|TEMP|REMOVE)\\b'
     'name': 'storage.type.class.${1:/downcase}'
   }
   {
diff --git a/snippets/todo.cson b/snippets/todo.cson
index 7ae914b..732b0a1 100644
--- a/snippets/todo.cson
+++ b/snippets/todo.cson
@@ -26,6 +26,9 @@
   'question':
     'prefix': 'question'
     'body': '# QUESTION: $0'
+  'remove':
+    'prefix': 'remove'
+    'body': '# REMOVE: $0'
 
 '.text.haml':
   'todo':
@@ -55,6 +58,9 @@
   'question':
     'prefix': 'question'
     'body': '-# QUESTION: $0'
+  'remove':
+    'prefix': 'remove'
+    'body': '-# REMOVE: $0'
 
 '.text.html.ruby, .text.erb':
   'todo':
@@ -84,6 +90,9 @@
   'question':
     'prefix': 'question'
     'body': '<%# QUESTION: $0 %>'
+  'remove':
+    'prefix': 'remove'
+    'body': '<%# REMOVE: $0 %>'
 
 '.text.html.ruby .meta,tag, .text.erb .meta.tag':
   'todo':
@@ -104,6 +113,8 @@
     'prefix': 'bug'
   'question':
     'prefix': 'question'
+  'remove':
+    'prefix': 'remove'
 
 '.html.basic':
   'todo':
@@ -133,6 +144,9 @@
   'question':
     'prefix': 'question'
     'body': '<!-- QUESTION: $0 -->'
+  'remove':
+    'prefix': 'remove'
+    'body': '<!-- REMOVE: $0 -->'
 
 '.html.basic .meta.tag':
   'todo':
@@ -153,6 +167,8 @@
     'prefix': 'bug'
   'question':
     'prefix': 'question'
+  'remove':
+    'prefix': 'remove'
 
 '.source.scss, .source.sass, .source.css.scss, .source.css.sass, .source.css.less, .source.js, .source.go, .source.scala, .source.ts, .source.php':
   'todo':
@@ -182,6 +198,9 @@
   'question':
     'prefix': 'question'
     'body': '// QUESTION: $0'
+  'remove':
+    'prefix': 'remove'
+    'body': '// REMOVE: $0'
 
 '.source.css':
   'todo':
@@ -211,6 +230,9 @@
   'question':
     'prefix': 'question'
     'body': '/* QUESTION: $0 */'
+  'remove':
+    'prefix': 'remove'
+    'body': '/* REMOVE: $0 */'
 
 '.source.css .meta.property-value':
   'todo':
@@ -231,6 +253,8 @@
     'prefix': 'bug'
   'question':
     'prefix': 'question'
+  'remove':
+    'prefix': 'remove'
 
 '.text.html.php':
   'todo':
@@ -260,3 +284,6 @@
   'question':
     'prefix': 'question'
     'body': '<?php // QUESTION: $1 ?>$0'
+  'remove':
+    'prefix': 'remove'
+    'body': '<?php // REMOVE: $1 ?>$0'