diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 32078ea231..8ba7b64355 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -6624,6 +6624,7 @@ Shell:
   - shell-script
   - bash
   - zsh
+  - envrc
   extensions:
   - ".sh"
   - ".bash"
@@ -6646,6 +6647,7 @@ Shell:
   - ".bash_profile"
   - ".bashrc"
   - ".cshrc"
+  - ".envrc"
   - ".flaskenv"
   - ".kshrc"
   - ".login"
diff --git a/samples/Shell/filenames/.envrc b/samples/Shell/filenames/.envrc
new file mode 100644
index 0000000000..38dc6c9f75
--- /dev/null
+++ b/samples/Shell/filenames/.envrc
@@ -0,0 +1 @@
+export JAVA_HOME=`/usr/libexec/java_home -v 1.8`