diff --git a/autogen.sh b/autogen.sh
index fb39e28..6eb2883 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,7 +27,10 @@
 set -e
 
 aclocal -I m4
-libtoolize --automake
+# Mac OS X: Use glibtoolize instead
+(glibtoolize --version) < /dev/null > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize |
+| LIBTOOLIZE=libtoolize
+$LIBTOOLIZE --automake
 autoheader
 automake --add-missing
 autoconf
diff --git a/hacking/ChangeLog b/hacking/ChangeLog
index da722ed..c5cce1f 100644
--- a/hacking/ChangeLog
+++ b/hacking/ChangeLog
@@ -444,3 +444,4 @@
          (patch #324) (Santiago Vila).
 20140424 fmfconv.c: correct vga resolution (Sergio).
 20140507 m4/iconv.m4: update iconv to version from gettext-0.18.2 (Fred).
+20140507 autogen.sh: select glibtoolize where required (Sergio).