diff --git a/fluidsynth/configure.ac b/fluidsynth/configure.ac
index bbc182e6..22f7bdee 100644
--- a/fluidsynth/configure.ac
+++ b/fluidsynth/configure.ac
@@ -145,10 +145,10 @@ AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
   ENABLE_DEBUG=$enableval)
 
 if test "$ENABLE_DEBUG" = "yes"; then
-  CFLAGS="${CFLAGS} ${FCCFLAGS} -g -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-unused-parameter"
+  CFLAGS="${CFLAGS} ${FCCFLAGS} -g -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-unused-parameter -Wno-cast-qual"
   AC_DEFINE(DEBUG, 1, [Define to activate debugging message]) 
 else
-  CFLAGS="${CFLAGS} ${FCCFLAGS} -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Winline -Wno-unused-parameter"
+  CFLAGS="${CFLAGS} ${FCCFLAGS} -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Winline -Wno-unused-parameter -Wno-cast-qual"
   AC_DEFINE(DEBUG, 0, [Define to activate debugging message])
 fi
 
diff --git a/fluidsynth/doc/Makefile.am b/fluidsynth/doc/Makefile.am
index fcb41c96..6eecabc5 100644
--- a/fluidsynth/doc/Makefile.am
+++ b/fluidsynth/doc/Makefile.am
@@ -1,7 +1,18 @@
 #  install the man pages and include in distribution
 man_MANS = fluidsynth.1 
-EXTRA_DIST = $(man_MANS) Doxyfile example.c fluidsynth.1 \
-  fluidsynth-v10-devdoc.xml FluidSynth-LADSPA.pdf
+
+EXTRA_DIST = \
+  $(man_MANS) \
+  Doxyfile \
+  example.c \
+  fluidsynth-v10-devdoc.xml \
+  fluidsynth-v11-devdoc.txt \
+  fluidsynth_arpeggio.c \
+  fluidsynth_fx.c \
+  fluidsynth_metronome.c \
+  fluidsynth_simple.c \
+  xtrafluid.txt \
+  FluidSynth-LADSPA.pdf
 
 docbook_docs = fluidsynth-v10-devdoc.xml
 
diff --git a/fluidsynth/src/fluid_coremidi.c b/fluidsynth/src/fluid_coremidi.c
index 5f02a9c8..03e1472a 100644
--- a/fluidsynth/src/fluid_coremidi.c
+++ b/fluidsynth/src/fluid_coremidi.c
@@ -32,6 +32,22 @@
 #include "fluid_mdriver.h"
 #include "fluid_settings.h"
 
+/* Work around for OSX 10.4 */
+
+/* enum definition in OpenTransportProviders.h defines these tokens 
+   which are #defined from <netinet/tcp.h> */
+#ifdef TCP_NODELAY
+#undef TCP_NODELAY
+#endif
+#ifdef TCP_MAXSEG
+#undef TCP_MAXSEG
+#endif
+#ifdef TCP_KEEPALIVE
+#undef TCP_KEEPALIVE
+#endif
+
+/* End work around */
+
 #include <unistd.h>
 #include <CoreServices/CoreServices.h>
 #include <CoreMIDI/MIDIServices.h>