diff --git a/AUTHORS b/AUTHORS
index cbf7e777d..e5d239893 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -39,6 +39,9 @@ Matsnev, Mike (Haali) <mike@po.cs.msu.su>
     * Windows implementation for vsscanf
     * The MPEG header generation for VobSub extraction
 
+Mierzejewski, Dominik (Rathann) <dominik@greysector.net>
+    * Patch for proper Boost detection for cross compilation builds
+
 Millan, Robert <rmh@aybabtu.com>
     * MIME type recognition via libmagic
     * Fix for a malloc bomb in the PCM handling
diff --git a/ChangeLog b/ChangeLog
index 23a2a9d59..40146ffac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-04  Moritz Bunkus  <moritz@bunkus.org>
+
+	* Build system: bug fix: Configure does not use "uname -m" for the
+	detection of the Boost libraries anymore but configure's "$target"
+	environment variable. This fixes the Boost detection for cross
+	compilation builds. Fix for bug 311. Patch by Dominik Mierzejewski
+	(see AUTHORS).
+
 2008-12-03  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: bug fix: PCM audio tracks bigger than approximately 8