diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 572fddc2..e0f515a0 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -119,7 +119,6 @@ Common Lisp:
   :aliases:
   - lisp
   :ext:
-  - .cl
   - .lisp
   - .ny
 Cucumber:
@@ -377,6 +376,10 @@ Objective-J:
   :ext:
   - .j
   - .sj
+OpenCL:
+  :lexer: C
+  :ext:
+  - .cl
 PHP:
   :ext:
   - .php
diff --git a/test/test_blob.rb b/test/test_blob.rb
index 47f953d8..68082d35 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -220,6 +220,7 @@ class TestBlob < Test::Unit::TestCase
     assert_equal Language['Objective-C'], blob("Foo.h").language
     assert_equal Language['Objective-C'], blob("FooAppDelegate.m").language
     assert_equal Language['Objective-C'], blob("FooAppDelegate.h").language
+    assert_equal Language['OpenCL'],      blob("fft.cl").language
     assert_equal Language['GAS'],         blob("hello.s").language
 
     # Config files
diff --git a/test/test_language.rb b/test/test_language.rb
index 4dd8274d..dcc31ab8 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -259,6 +259,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Lexer['objdump'],           Language['ObjDump'].lexer
     assert_equal Lexer['Objective-C'],       Language['Objective-C'].lexer
     assert_equal Lexer['Objective-J'],       Language['Objective-J'].lexer
+    assert_equal Lexer['C'],                 Language['OpenCL'].lexer
     assert_equal Lexer['PHP'],               Language['PHP'].lexer
     assert_equal Lexer['Text only'],         Language['Parrot Internal Representation'].lexer
     assert_equal Lexer['Perl'],              Language['Perl'].lexer