diff --git a/classes/Kohana/Log/Filter/Body.php b/classes/Kohana/Log/Filter/Body.php
new file mode 100644
index 000000000..2c9b2ad96
--- /dev/null
+++ b/classes/Kohana/Log/Filter/Body.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Filter out logs by the body of the log message using a regex pattern
+ *
+ * @package    Kohana
+ * @category   Logging
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2012 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Log_Filter_Body implements Kohana_Log_Filter {
+
+	/**
+	 * @var a regex pattern to test log entries' bodies against
+	 */
+	private $regex_pattern;
+
+	public function __construct($regex_pattern)
+	{
+		if ( ! is_string($regex_pattern))
+		{
+			throw new InvalidArgumentException('Argument 1 of the constructor of Log_Filter_Body must be a string');
+		}
+		$this->regex_pattern = $regex_pattern;
+	}
+
+	public function process(array $messages)
+	{
+		$filtered = array();
+
+		foreach ($messages as $message)
+		{
+			if (preg_match($this->regex_pattern, $message['body']))
+			{
+				$filtered[] = $message;
+			}
+		}
+
+		return $filtered;
+	}
+
+}
diff --git a/classes/Kohana/Log/Filter/Exception.php b/classes/Kohana/Log/Filter/Exception.php
new file mode 100644
index 000000000..de07fe993
--- /dev/null
+++ b/classes/Kohana/Log/Filter/Exception.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Filter out logs when they are generated through an exception
+ *
+ * @package    Kohana
+ * @category   Logging
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2012 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Log_Filter_Exception implements Kohana_Log_Filter {
+
+	/**
+	 * @var Exception class name to filter log entries against
+	 */
+	private $exception;
+
+	public function __construct($exception = 'Exception')
+	{
+		if (!is_string($exception))
+		{
+			throw new InvalidArgumentException('Argument 1 of the constructor of Log_Filter_Exception must be a string');
+		}
+		$this->exception = $exception;
+	}
+
+	public function process(array $messages)
+	{
+		$filtered = array();
+
+		foreach ($messages as $message)
+		{
+			if (
+			  (isset($message['exception']))
+			  AND
+			  ($message['exception'] instanceof $this->exception)
+			)
+			{
+				$filtered[] = $message;
+			}
+		}
+
+		return $filtered;
+	}
+
+}
diff --git a/classes/Kohana/Log/Filter/File.php b/classes/Kohana/Log/Filter/File.php
new file mode 100644
index 000000000..950476a00
--- /dev/null
+++ b/classes/Kohana/Log/Filter/File.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Filter out logs by the originating file using a regex pattern
+ *
+ * @package    Kohana
+ * @category   Logging
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2012 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Log_Filter_File implements Kohana_Log_Filter {
+
+	/**
+	 * @var a regex pattern to test log entries' originating file against
+	 */
+	private $regex_pattern;
+
+	public function __construct($regex_pattern)
+	{
+		if ( ! is_string($regex_pattern))
+		{
+			throw new InvalidArgumentException('Argument 1 of the constructor of Log_Filter_File must be a string');
+		}
+		$this->regex_pattern = $regex_pattern;
+	}
+
+	public function process(array $messages)
+	{
+		$filtered = array();
+
+		foreach ($messages as $message)
+		{
+			if (preg_match($this->regex_pattern, $message['file']))
+			{
+				$filtered[] = $message;
+			}
+		}
+
+		return $filtered;
+	}
+
+}
diff --git a/classes/Kohana/Log/Filter/Union.php b/classes/Kohana/Log/Filter/Union.php
new file mode 100644
index 000000000..8b5a5ea22
--- /dev/null
+++ b/classes/Kohana/Log/Filter/Union.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * A log filter that accepts other filters and make a union (OR logic) of logs
+ *
+ * @package    Kohana
+ * @category   Logging
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2012 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Log_Filter_Union implements Kohana_Log_Filter_Aware, Kohana_Log_Filter {
+
+	/**
+	 * @var array of Kohana_Log_Filter
+	 */
+	private $filters;
+
+	public function __construct(array $filters)
+	{
+		foreach ($filters as $filter)
+		{
+			$this->attach_filter($filter);
+		}
+	}
+
+	public function process(array $messages)
+	{
+		$filtered = array();
+
+		foreach ($this->filters as $filter)
+		{
+			$filtered[] = $filter->process($messages);
+		}
+
+		return array_unique($filtered);
+	}
+
+	/**
+	 * Ataches a log filter
+	 *
+	 * @param Kohana_Log_Filter $filter
+	 * @return Log_Filter_Union
+	 */
+	public function attach_filter(Kohana_Log_Filter $filter)
+	{
+		$this->filters[spl_object_hash($filter)] = $filter;
+
+		return $this;
+	}
+
+	/**
+	 * Detaches a log filter
+	 *
+	 * @param Kohana_Log_Filter $filter
+	 * @return Log_Filter_Union
+	 */
+	public function detach_filter(Kohana_Log_Filter $filter)
+	{
+		unset($this->filters[spl_object_hash($filter)]);
+
+		return $this;
+	}
+
+	public function filter(array $messages)
+	{
+		return $this->process($messages);
+	}
+}
diff --git a/classes/Log/Filter/Body.php b/classes/Log/Filter/Body.php
new file mode 100644
index 000000000..db0bf2543
--- /dev/null
+++ b/classes/Log/Filter/Body.php
@@ -0,0 +1,3 @@
+<?php
+
+class Log_Filter_Body extends Kohana_Log_Filter_Body {}
diff --git a/classes/Log/Filter/Exception.php b/classes/Log/Filter/Exception.php
new file mode 100644
index 000000000..3748441d8
--- /dev/null
+++ b/classes/Log/Filter/Exception.php
@@ -0,0 +1,3 @@
+<?php
+
+class Log_Filter_Exception extends Kohana_Log_Filter_Exception {}
diff --git a/classes/Log/Filter/File.php b/classes/Log/Filter/File.php
new file mode 100644
index 000000000..5d1292249
--- /dev/null
+++ b/classes/Log/Filter/File.php
@@ -0,0 +1,3 @@
+<?php
+
+class Log_Filter_File extends Kohana_Log_Filter_File {}
diff --git a/classes/Log/Filter/Union.php b/classes/Log/Filter/Union.php
new file mode 100644
index 000000000..fcc0b105b
--- /dev/null
+++ b/classes/Log/Filter/Union.php
@@ -0,0 +1,3 @@
+<?php
+
+class Log_Filter_Union extends Kohana_Log_Filter_Union {}