diff --git a/autotools/bootstrap b/autotools/bootstrap
index 5752522..23d08f6 100755
--- a/autotools/bootstrap
+++ b/autotools/bootstrap
@@ -2,7 +2,7 @@
 
 # bootstrap: generic bootstrap/autogen.sh script for autotools projects
 #
-# Copyright (c) 2002-2010 Sam Hocevar <sam@hocevar.net>
+# Copyright (c) 2002-2011 Sam Hocevar <sam@hocevar.net>
 #
 #    This program is free software. It comes without any warranty, to
 #    the extent permitted by applicable law. You can redistribute it
@@ -112,6 +112,17 @@ if test -n "$auxdir"; then
   aclocalflags="${aclocalflags} -I $auxdir -I ."
 fi
 
+# Honour M4PATH because sometimes M4 doesn't
+save_IFS=$IFS
+IFS=:
+tmp="$M4PATH"
+for x in $tmp; do
+  if test -n "$x"; then
+    aclocalflags="${aclocalflags} -I $x"
+  fi
+done
+IFS=$save_IFS
+
 # Explain what we are doing from now
 set -x