diff --git a/fluidsynth/ChangeLog b/fluidsynth/ChangeLog
index e6ed8953..dc9b5783 100644
--- a/fluidsynth/ChangeLog
+++ b/fluidsynth/ChangeLog
@@ -1,7 +1,10 @@
 2007-11-17    Josh Green <jgreen@users.sourceforge.net>
 
 	* FluidSynth release 1.0.8 "Its about funky time!"
-	* configure.ac: Bumped LT_REVISION.
+	* configure.ac: Bumped LT_REVISION and added call to AM_PROG_CC_C_O macro.
+	* Makefile: Updated fluidsynth.prj to fluidsynth.anjuta
+	* README-OSX: Update from Ebrahim Mayat for OS X Leopard
+	* acinclude.m4: Fixed embedded main function in AM_PATH_READLINE macro.
 
 2007-11-11    Josh Green <jgreen@users.sourceforge.net>
 
diff --git a/fluidsynth/Makefile.am b/fluidsynth/Makefile.am
index f52b19c2..c4ffd697 100644
--- a/fluidsynth/Makefile.am
+++ b/fluidsynth/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = macbuild sf2 winbuild src doc include
 EXTRA_DIST = TODO acinclude.m4 autogen.sh fluidsynth.pc.in \
-  fluidsynth.spec.in fluidsynth.spec fluidsynth.prj README-OSX
+  fluidsynth.spec.in fluidsynth.spec fluidsynth.anjuta README-OSX
 DISTCLEANFILES = fluidsynth.pc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = fluidsynth.pc
diff --git a/fluidsynth/README-OSX b/fluidsynth/README-OSX
index 319f6f40..a11a67d1 100644
--- a/fluidsynth/README-OSX
+++ b/fluidsynth/README-OSX
@@ -1,11 +1,11 @@
-Compiling fluidsynth-1.0.8 on Mac OS X.4.10 (Tiger)
+Compiling fluidsynth-1.0.8 on Mac OS X.5 (Leopard)
 -----------------------------------------------------------------------
 Requirements:
-- "XcodeTools.mpkg","DevSDK.pkg", "CoreAudioSDK.pkg" packages (The Tiger Install DVD).
+- "XcodeTools.mpkg","DevSDK.pkg", "CoreAudioSDK.pkg" packages (The Leopard Install DVD).
 
 - Fink installation <http://fink.sourceforge.net>
 
-- libgnugetopt-1.2, readline-4.3, ladspa-1.12 and ladspa-cmt-1.15 from fink: e.g. "fink install libgnugetopt"
+- libgnugetopt and readline from fink: e.g. "fink install libgnugetopt"
 
 - midishare-1.92-macosx <http://midishare.sourceforge.net>
 
@@ -30,12 +30,15 @@ CoreAudio:             yes
 LADSPA support:        no
 LASH support:          no
 LADCCA support:        no
-Readline:              no
-Debug:                 yes
+Readline:              yes
 Profiling:             no
+Debug:                 no
+Trap on FPE (debug):   no
+Check FPE (debug):     no
 **************************************************************
 
 4. make && make install as root
  
 Ebrahim Mayat <emayat@users.sourceforge.net>
-4th September 2007
+12th November 2007
+
diff --git a/fluidsynth/acinclude.m4 b/fluidsynth/acinclude.m4
index 0d6cfb8f..a574b64a 100644
--- a/fluidsynth/acinclude.m4
+++ b/fluidsynth/acinclude.m4
@@ -1,6 +1,6 @@
 dnl Some additional autoconf macros
 
-AC_DEFUN(AC_MIDISHARE,
+AC_DEFUN([AC_MIDISHARE],
 [
   AC_ARG_ENABLE(midishare, AS_HELP_STRING([--enable-midishare],
 	  [Compile MIDISHARE support (default=auto)]),
@@ -34,7 +34,7 @@ AC_DEFUN(AC_MIDISHARE,
    fi	dnl  enable_midishare != no?
 ])
 
-AC_DEFUN(AC_OSS_AUDIO,
+AC_DEFUN([AC_OSS_AUDIO],
 [
   AC_ARG_ENABLE(oss-support,
     [  --disable-oss-support   Do not compile OSS support (default=auto)],
@@ -66,7 +66,7 @@ dnl Test for readline, and define READLINE_CFLAGS and
 dnl READLINE_LIBS as appropriate.
 dnl enables arguments --with-readline-prefix=
 
-AC_DEFUN(AM_PATH_READLINE,
+AC_DEFUN([AM_PATH_READLINE],
 [dnl Save the original CFLAGS, and LIBS
 save_CFLAGS="$CFLAGS"
 save_LIBS="$LIBS"
@@ -98,14 +98,11 @@ AC_TRY_COMPILE([
 #include <stdio.h>
 #include <readline/readline.h>
 ], [
-int main(void)
-{
 #ifndef readline
    return (1);
 #else
    return (0);
 #endif
-}
 ],
   [AC_MSG_RESULT(found.)],
   [AC_MSG_RESULT(not present.)
diff --git a/fluidsynth/configure.ac b/fluidsynth/configure.ac
index d4483495..0f4c00cc 100644
--- a/fluidsynth/configure.ac
+++ b/fluidsynth/configure.ac
@@ -41,6 +41,7 @@ CFLAGS="$CFLAGS -Wall"
 
 dnl Check for programs
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 dnl AC_PROG_RANLIB
 AC_LIBTOOL_WIN32_DLL
diff --git a/fluidsynth/src/config.h.in b/fluidsynth/src/config.h.in
index fdd78663..b4e0de2a 100644
--- a/fluidsynth/src/config.h.in
+++ b/fluidsynth/src/config.h.in
@@ -129,6 +129,9 @@
 /* Define if using the MinGW32 environment */
 #undef MINGW32
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Define to enable OSS driver */
 #undef OSS_SUPPORT