diff --git a/grammars.yml b/grammars.yml
index 203c5a58..c375c919 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -238,6 +238,8 @@ https://github.com/textmate/bison.tmbundle:
 https://github.com/textmate/c.tmbundle:
 - source.c
 - source.c++
+https://github.com/textmate/capnproto.tmbundle:
+- source.capnp
 https://github.com/textmate/cmake.tmbundle:
 - source.cache.cmake
 - source.cmake
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 9723ce4b..cd8222c9 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -386,6 +386,12 @@ CSS:
   extensions:
   - .css
 
+Cap'n Proto:
+  type: programming
+  tm_scope: source.capnp
+  extensions:
+  - .capnp
+
 Ceylon:
   type: programming
   extensions: