diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 7e158b94..1249d135 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -101,6 +101,8 @@ Brainfuck:
 
 C:
   major: true
+  overrides:
+  - .h
   extensions:
   - .c
   - .h
@@ -124,6 +126,7 @@ C++:
   - .cpp
   - .cu
   - .cxx
+  - .h
   - .h++
   - .hh
   - .hpp
@@ -547,6 +550,7 @@ Objective-C:
   overrides:
   - .m
   extensions:
+  - .h
   - .m
   - .mm
 
diff --git a/test/test_language.rb b/test/test_language.rb
index 8fc881ec..4acb7b65 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -6,6 +6,9 @@ class TestLanguage < Test::Unit::TestCase
   include Linguist
 
   def test_ambiguous_extensions
+    assert Language.ambiguous?('.h')
+    assert_equal Language['C'], Language.find_by_extension('h')
+
     assert Language.ambiguous?('.m')
     assert_equal Language['Objective-C'], Language.find_by_extension('m')