diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index d0806eaa..7ade41ec 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -721,6 +721,12 @@ Ruby:
   - Thorfile
   - Gemfile
 
+Rust:
+  type: programming
+  extensions:
+  - .rs
+  - .rc
+
 SQL:
   type: data
   searchable: false
diff --git a/lib/linguist/mimes.yml b/lib/linguist/mimes.yml
index 2f726f36..c2e12205 100644
--- a/lib/linguist/mimes.yml
+++ b/lib/linguist/mimes.yml
@@ -55,4 +55,5 @@ text/plain @cu,cxx
 text/x-nimrod @nim
 text/x-ocaml @ml,mli,mll,mly,sig,sml
 text/x-nemerle @n
+text/x-rust @rs,rc
 text/x-scheme @rkt,scm,sls,sps,ss
diff --git a/test/fixtures/hello.rs b/test/fixtures/hello.rs
new file mode 100644
index 00000000..5579f684
--- /dev/null
+++ b/test/fixtures/hello.rs
@@ -0,0 +1,3 @@
+fn main() { 
+    log "Hello, world!"; 
+}
diff --git a/test/test_blob.rb b/test/test_blob.rb
index 42d573e1..dbef035d 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -298,6 +298,9 @@ class TestBlob < Test::Unit::TestCase
 
     # https://github.com/dharmatech/agave/blob/master/demos/asteroids.sps
     assert_equal Language['Scheme'], blob("asteroids.sps").language
+
+    # https://github.com/graydon/rust
+    assert_equal Language['Rust'], blob("hello.rs").language
   end
 
   def test_lexer
diff --git a/test/test_mime.rb b/test/test_mime.rb
index 420f02c4..1ffcd84b 100644
--- a/test/test_mime.rb
+++ b/test/test_mime.rb
@@ -62,6 +62,8 @@ class TestMime < Test::Unit::TestCase
     assert_equal 'text/plain', Mime.mime_for('.hh')
     assert_equal 'text/plain', Mime.mime_for('.hpp')
     assert_equal 'text/plain', Mime.mime_for('.kt')
+    assert_equal 'text/rust', Mime.mime_for('.rs')
+    assert_equal 'text/rust', Mime.mime_for('.rc')
     assert_equal 'video/quicktime', Mime.mime_for('.mov')
   end