diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index fb645c70..7e558ccc 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -279,16 +279,6 @@ Arc:
   tm_scope: none
   ace_mode: text
   language_id: 20
-Arduino:
-  type: programming
-  color: "#bd79d1"
-  extensions:
-  - ".ino"
-  tm_scope: source.c++
-  ace_mode: c_cpp
-  codemirror_mode: clike
-  codemirror_mime_type: text/x-c++src
-  language_id: 21
 AsciiDoc:
   type: prose
   ace_mode: asciidoc
@@ -528,6 +518,7 @@ C++:
   - ".hxx"
   - ".inc"
   - ".inl"
+  - ".ino"
   - ".ipp"
   - ".re"
   - ".tcc"
diff --git a/samples/Arduino/hello.ino b/samples/C++/hello.ino
similarity index 100%
rename from samples/Arduino/hello.ino
rename to samples/C++/hello.ino
diff --git a/samples/Arduino/octave_changer.ino b/samples/C++/octave_changer.ino
similarity index 100%
rename from samples/Arduino/octave_changer.ino
rename to samples/C++/octave_changer.ino
diff --git a/vendor/README.md b/vendor/README.md
index 757268ef..c8bbded6 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -24,7 +24,6 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **APL:** [Alhadis/language-apl](https://github.com/Alhadis/language-apl)
 - **Apollo Guidance Computer:** [Alhadis/language-agc](https://github.com/Alhadis/language-agc)
 - **AppleScript:** [textmate/applescript.tmbundle](https://github.com/textmate/applescript.tmbundle)
-- **Arduino:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle)
 - **AsciiDoc:** [zuckschwerdt/asciidoc.tmbundle](https://github.com/zuckschwerdt/asciidoc.tmbundle)
 - **ASN.1:** [ajLangley12/language-asn1](https://github.com/ajLangley12/language-asn1)
 - **ASP:** [textmate/asp.tmbundle](https://github.com/textmate/asp.tmbundle)