diff --git a/lib/syslog-formatter.rb b/lib/syslog-formatter.rb
index b0420ff..7b1adc5 100644
--- a/lib/syslog-formatter.rb
+++ b/lib/syslog-formatter.rb
@@ -3,7 +3,7 @@
 #   [Time.mSec] [SeverityLabel]: message
 
 class Logger::SyslogFormatter < Logger::Formatter
-  Format = "[%s] [%5s]: %s\n"
+  Format = "[%5s] %s\n"
 
   attr_accessor :datetime_format
 
@@ -12,19 +12,11 @@ def initialize
   end
 
   def call(severity, time, progname, msg)
-    Format % [format_datetime(time), severity, msg2str(msg)]
+    Format % [severity, msg2str(msg)]
   end
 
   protected
 
-  def format_datetime(time)
-    if @datetime_format.nil?
-      time.strftime("%H:%M:%S.") << "%06d " % time.usec
-    else
-      time.strftime(@datetime_format)
-    end
-  end
-
   def msg2str(msg)
     case msg
     when ::String
@@ -37,4 +29,4 @@ def msg2str(msg)
     end
   end
    
-end
\ No newline at end of file
+end
diff --git a/test/test_syslog_logger.rb b/test/test_syslog_logger.rb
index d768f76..9730da9 100644
--- a/test/test_syslog_logger.rb
+++ b/test/test_syslog_logger.rb
@@ -11,7 +11,7 @@ class << MockSyslog
   Logger::Syslog::LOGGER_MAP.values.uniq.each do |level|
     eval <<-EOM
       def #{level}(message)
-        @line = "#{level.to_s.upcase} - \#{message}"
+        @line = message
       end
     EOM
   end
@@ -464,11 +464,8 @@ class Log
     attr_reader :line, :label, :datetime, :pid, :severity, :progname, :msg
     def initialize(line)
       @line = line
-      return unless /\A(\w+) - (.*)\Z/ =~ @line
-      severity, @msg = $1, $2
-      severity = Logger::Syslog::LOGGER_MAP.invert[severity.downcase.intern]
-      @severity = severity.to_s.upcase
-      @severity = 'ANY' if @severity == 'UNKNOWN'
+      return unless /\A\[\s*([^\]]+)\] ([\x0-\xff]*)/ =~ @line
+      @severity, @msg = $1, $2
     end
   end