diff --git a/lib/fluent/parser.rb b/lib/fluent/parser.rb
index 2f12293841..2724bb861d 100644
--- a/lib/fluent/parser.rb
+++ b/lib/fluent/parser.rb
@@ -169,6 +169,18 @@ def call(text)
       end
     end
 
+    class NoneParser
+      include Configurable
+
+      config_param :message_key, :string, :default => 'message'
+
+      def call(text)
+        record = {}
+        record[@message_key] = text
+        return Engine.now, record
+      end
+    end
+
     class ApacheParser
       include Configurable
 
@@ -229,6 +241,7 @@ def call(text)
       'ltsv' => Proc.new { LabeledTSVParser.new },
       'csv' => Proc.new { CSVParser.new },
       'nginx' => Proc.new { RegexpParser.new(/^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$/,  {'time_format'=>"%d/%b/%Y:%H:%M:%S %z"}) },
+      'none' => Proc.new { NoneParser.new },
     }
 
     def self.register_template(name, regexp_or_proc, time_format=nil)
diff --git a/test/parser.rb b/test/parser.rb
index b6010f0a88..89866cbc74 100644
--- a/test/parser.rb
+++ b/test/parser.rb
@@ -190,4 +190,32 @@ def test_call_with_customized_time_format
       }, record)
     end
   end
+
+  class NoneParserTest < ::Test::Unit::TestCase
+    include ParserTest
+
+    def test_config_params
+      parser = TextParser::NoneParser.new
+      assert_equal "message", parser.message_key
+
+      parser.configure('message_key' => 'foobar')
+      assert_equal "foobar", parser.message_key
+    end
+
+    def test_call
+      parser = TextParser::TEMPLATE_FACTORIES['none'].call
+      time, record = parser.call('log message!')
+
+      assert_equal({'message' => 'log message!'}, record)
+    end
+
+    def test_call_with_message_key
+      parser = TextParser::NoneParser.new
+      parser.configure('message_key' => 'foobar')
+      time, record = parser.call('log message!')
+
+      assert_equal({'foobar' => 'log message!'}, record)
+    end
+  end
+
 end