diff --git a/classes/Kohana/Log.php b/classes/Kohana/Log.php
index 07f0434e1..a5e92e23b 100644
--- a/classes/Kohana/Log.php
+++ b/classes/Kohana/Log.php
@@ -161,7 +161,7 @@ public function add($level, $message, array $values = NULL, array $additional =
 			'level'      => $level,
 			'body'       => $message,
 			'trace'      => $trace,
-			'file'       => isset($trace[0]['file']) ? $trace[0]['file'] : NULL,
+			'file'       => isset($trace[0]['file']) ? Debug::path($trace[0]['file']) : NULL,
 			'line'       => isset($trace[0]['line']) ? $trace[0]['line'] : NULL,
 			'class'      => isset($trace[0]['class']) ? $trace[0]['class'] : NULL,
 			'function'   => isset($trace[0]['function']) ? $trace[0]['function'] : NULL,
diff --git a/classes/Kohana/Log/Writer.php b/classes/Kohana/Log/Writer.php
index c7c967810..541bd1ae2 100644
--- a/classes/Kohana/Log/Writer.php
+++ b/classes/Kohana/Log/Writer.php
@@ -73,13 +73,15 @@ final public function __toString()
 	 * @param   string  $format
 	 * @return  string
 	 */
-	public function format_message(array $message, $format = "time --- level: body in file:line")
+	public function format_message(array $message, $format = "time --- level: body ~ file [ line ]")
 	{
 		$message['time'] = Date::formatted_time('@'.$message['time'], Log_Writer::$timestamp, Log_Writer::$timezone, TRUE);
 		$message['level'] = $this->_log_levels[$message['level']];
 
 		$string = strtr($format, array_filter($message, 'is_scalar'));
 
+		if (substr($string,-16)===' ~ file [ line ]')
+			$string=substr($string,0,-16);
 		if (isset($message['additional']['exception']))
 		{
 			// Re-use as much as possible, just resetting the body to the trace