diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index a7de46f3..c672252b 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -66,6 +66,12 @@ Arc:
   extensions:
   - .arc
 
+Arduino:
+  type: programming
+  lexer: C++
+  extensions:
+  - .ino
+
 Assembly:
   type: programming
   lexer: NASM
diff --git a/test/fixtures/hello.ino b/test/fixtures/hello.ino
new file mode 100644
index 00000000..469cecde
--- /dev/null
+++ b/test/fixtures/hello.ino
@@ -0,0 +1,7 @@
+void setup() {
+  Serial.begin(9600);
+}
+
+void loop() {
+  Serial.print("Hello");
+}
diff --git a/test/test_blob.rb b/test/test_blob.rb
index adcdd226..ac426842 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -263,6 +263,7 @@ class TestBlob < Test::Unit::TestCase
     assert_equal Language['Ruby'],        blob("foo.rb").language
     assert_equal Language['Ruby'],        blob("script.rb").language
     assert_equal Language['Ruby'],        blob("wrong_shebang.rb").language
+    assert_equal Language['Arduino'],     blob("hello.ino").language
     assert_nil blob("octocat.png").language
 
     # .pl disambiguation