diff --git a/plugins/code_block.rb b/plugins/code_block.rb
index 4d7ca6b..9c971bf 100644
--- a/plugins/code_block.rb
+++ b/plugins/code_block.rb
@@ -55,9 +55,9 @@ module Jekyll
       @caption = nil
       @filetype = nil
       @highlight = true
-      if markup =~ /\s+lang:(\w+)/i
+      if markup =~ /\s*lang:(\w+)/i
         @filetype = $1
-        markup = markup.sub(/\s+lang:\w+\s*/i,'')
+        markup = markup.sub(/lang:\w+/i,'')
       end
       if markup =~ CaptionUrlTitle
         @file = $1
diff --git a/plugins/include_code.rb b/plugins/include_code.rb
index 046f624..5529f32 100644
--- a/plugins/include_code.rb
+++ b/plugins/include_code.rb
@@ -30,9 +30,9 @@ module Jekyll
     def initialize(tag_name, markup, tokens)
       @title = nil
       @file = nil
-      if markup.strip =~ /\s+lang:(\w+)/i
+      if markup.strip =~ /\s*lang:(\w+)/i
         @filetype = $1
-        markup = markup.strip.sub(/\s+lang:\w+\s*/i,'')
+        markup = markup.strip.sub(/lang:\w+/i,'')
       end
       if markup.strip =~ /(.*)?(\s+|^)(\/*\S+)/i
         @title = $1 || nil