diff --git a/ChangeLog b/ChangeLog
index ad8afca695bdf034a231c3b7f1f2681651a7bce1..5679db4b9245caac98deda30083222efd0f83ee4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
 
 	* Fixed bug #12565: Scheduler: Added option to turn off logging, which could be too verbose
 	* Cleanup #12426: Reports: Localized all hard-coded strings in status reports
+	* Fixed bug #12396: Warning produced by t3lib_div::flushOutputBuffers() (Thanks to Michael Klapper)
 
 2009-11-16  Oliver Hader  <oliver@typo3.org>
 
diff --git a/t3lib/class.t3lib_div.php b/t3lib/class.t3lib_div.php
index b127639c24465c3b526ed7e787d5d5b6fba1c909..76ed5ba8cbdde1fdea1b42672335d29d3e48cabc 100644
--- a/t3lib/class.t3lib_div.php
+++ b/t3lib/class.t3lib_div.php
@@ -5773,7 +5773,6 @@ final class t3lib_div {
 		while (ob_get_level()) {
 			ob_end_flush();
 		}
-		header('Content-Encoding: None', TRUE);
 	}
 }