diff --git a/AUTHORS b/AUTHORS
index 2a594b380..a642cc5a8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -78,6 +78,11 @@ Lhomme, Steve (robux4) <slhomme@matroska.org>
     * The CorePicture XML reader
     * Changes for compilation with libebml2/libmatroska2
 
+Maier, Nils <maierman@web.de>
+    * File buffering improvements
+    * Input file buffering
+    * Error mode fix on Windows
+
 Medina, Sergi <nousernameremain@gmail.com>
     * Spanish translation
 
diff --git a/ChangeLog b/ChangeLog
index 0143eaa69..ee6d7c4f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-04  Nils Maier  <maierman@web.de>
+
+	* mkvmerge, mkvextract: enhancement: Implemented input file
+	buffering in mkvmerge and improved/implemented output file
+	buffering in other tools.
+
 2011-12-03  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mmg, mkvinfo's GUI: enhancement: Added new icons based on the