diff --git a/README b/README
index d7981499..f4a461ba 100644
--- a/README
+++ b/README
@@ -148,7 +148,7 @@ extra (and more verbose) error checking.
 assembly routines.  Many routines have assembly versions for
 speed and `configure' is pretty good about knowing what is
 supported, but you can use this option to build only from the
-C sources.
+C sources.  May be necessary for building on OS X (Intel)
 
 --enable-sse : If you are building for an x86 CPU that supports
 SSE instructions, you can enable some of the faster routines
diff --git a/autogen.sh b/autogen.sh
index e2b63ba1..6ba76d09 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,6 +20,15 @@
 #
 # before running autogen.sh
 #
+# If you are running on OS X and get errors related to the AM_ICONV
+# and/or AM_LANGINFO_CODESET macros, replace those 2 lines in
+# configure.in with
+#
+#   AC_DEFINE([HAVE_ICONV], [], [Whether we have libiconv available]) LIBICONV="-liconv"
+#   AC_SUBST(LIBICONV)
+#
+# See also http://lists.xiph.org/pipermail/flac-dev/2007-September/002384.html
+#
 # Also watchout, if you replace ltmain.sh, there is a bug in some
 # versions of libtool (or maybe autoconf) on some platforms where the
 # configure-generated libtool does not have $SED defined.  See also: