diff --git a/fluidsynth/ChangeLog b/fluidsynth/ChangeLog
index c1f4ef2b..3dd70d94 100644
--- a/fluidsynth/ChangeLog
+++ b/fluidsynth/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-08    Josh Green <jgreen@users.sourceforge.net>
+	* configure.ac: Followed GTK's lead for some unexplained magic for
+	  stupid libtool version parameters (fixes autogen.sh bomb on
+	  undefined macro LT_REVISION/LT_CURRENT/LT_AGE).  Added
+	  AC_CONFIG_MACRO_DIR([m4]) as suggested by libtoolize.
+	* Makefile.am: Added ACLOCAL_AMFLAGS=-I m4 as suggested by libtoolize.
+
 2008-12-23    Josh Green <jgreen@users.sourceforge.net>
 	* configure.ac: Added detection of PulseAudio driver.
 	* src/Makefile.am: Added conditional build of PulseAudio driver.
diff --git a/fluidsynth/Makefile.am b/fluidsynth/Makefile.am
index c4ffd697..62b2e645 100644
--- a/fluidsynth/Makefile.am
+++ b/fluidsynth/Makefile.am
@@ -1,8 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
+ACLOCAL_AMFLAGS=-I m4
+
 SUBDIRS = macbuild sf2 winbuild src doc include
 EXTRA_DIST = TODO acinclude.m4 autogen.sh fluidsynth.pc.in \
   fluidsynth.spec.in fluidsynth.spec fluidsynth.anjuta README-OSX
 DISTCLEANFILES = fluidsynth.pc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = fluidsynth.pc
+
diff --git a/fluidsynth/configure.ac b/fluidsynth/configure.ac
index e3dca126..a89d90ef 100644
--- a/fluidsynth/configure.ac
+++ b/fluidsynth/configure.ac
@@ -23,19 +23,20 @@ FLUIDSYNTH_VERSION="\"$VERSION\""
 
 dnl *** NOTICE ***
 dnl Update library version upon each release (follow these steps in order)
-dnl if any source code changes: LT_REVISION++
-dnl if any interfaces added/removed/changed: LT_CURRENT++ and LT_REVISION=0
-dnl if any interfaces have been added: LT_AGE++
-dnl if any interfaces have been removed/changed (compatibility broken): LT_AGE=0
+dnl if any source code changes: lt_revision++
+dnl if any interfaces added/removed/changed: lt_current++ and lt_revision=0
+dnl if any interfaces have been added: lt_age++
+dnl if any interfaces have been removed/changed (compatibility broken): lt_age=0
 
-LT_CURRENT=2
-LT_REVISION=2
-LT_AGE=1
+m4_define([lt_current], [2])
+m4_define([lt_revision], [2])
+m4_define([lt_age], [1])
 
-LT_VERSION_INFO="${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
+LT_VERSION_INFO="lt_current:lt_revision:lt_age"
 AC_SUBST(LT_VERSION_INFO)
 
 AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_MACRO_DIR([m4])
 
 CFLAGS="$CFLAGS -Wall"
 
diff --git a/fluidsynth/src/config.h.in b/fluidsynth/src/config.h.in
index 2be02cc4..341ab1c4 100644
--- a/fluidsynth/src/config.h.in
+++ b/fluidsynth/src/config.h.in
@@ -126,6 +126,10 @@
 /* Include the LADSPA Fx unit */
 #undef LADSPA
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Define to enable MidiShare driver */
 #undef MIDISHARE_SUPPORT