diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index c64344b4..c5452370 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -25,7 +25,7 @@ module Linguist
     #
     # Returns an array
     def self.detectable_markup
-      ["CSS", "Less", "Sass", "Markdown", "Textile", "reStructuredText", "AsciiDoc", "RDoc", "Org"]
+      ["CSS", "Less", "Sass", "Markdown", "Textile", "reStructuredText", "AsciiDoc", "RDoc", "Org", "Creole"]
     end
 
     # Internal: Create a new Language object
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 493e807c..204d048f 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -307,6 +307,12 @@ Cpp-ObjDump:
   - .c++objdump
   - .cxx-objdump
 
+Creole:
+  type: markup
+  lexer: Text only
+  wrap: true
+  primary_extension: .creole
+
 Cucumber:
   lexer: Gherkin
   primary_extension: .feature