diff --git a/lib-src/audacity-patches.txt b/lib-src/audacity-patches.txt
index 7e9f00ada..58465ff0a 100644
--- a/lib-src/audacity-patches.txt
+++ b/lib-src/audacity-patches.txt
@@ -82,6 +82,7 @@ Patches: endian.m4, lrint.m4, llrint.m4, lrintf.m4, clip_mode.m4 copied from
 			libsndfile's M4/.
 		 signal.m4 created out of the tail of acinclude.m4 with the remaining
 		 	necessary macro
+         autotools.patch: Fix autotools warnings.
 AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
 by default
 Upstream Version: 0.1.8
diff --git a/lib-src/libsamplerate/Makefile.am b/lib-src/libsamplerate/Makefile.am
index be52675a4..7b5013cdf 100644
--- a/lib-src/libsamplerate/Makefile.am
+++ b/lib-src/libsamplerate/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+ACLOCAL_AMFLAGS = -I M4
+
 DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
 
 SUBDIRS = src doc examples tests
diff --git a/lib-src/libsamplerate/Makefile.in b/lib-src/libsamplerate/Makefile.in
index 1b74e1e76..1b90b0c54 100644
--- a/lib-src/libsamplerate/Makefile.in
+++ b/lib-src/libsamplerate/Makefile.in
@@ -232,7 +232,6 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -366,6 +365,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+ACLOCAL_AMFLAGS = -I M4
 DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
 SUBDIRS = src doc examples tests
 DIST_SUBDIRS = Win32 $(SUBDIRS)
diff --git a/lib-src/libsamplerate/Win32/Makefile.in b/lib-src/libsamplerate/Win32/Makefile.in
index 976ec0452..6498b3167 100644
--- a/lib-src/libsamplerate/Win32/Makefile.in
+++ b/lib-src/libsamplerate/Win32/Makefile.in
@@ -117,7 +117,6 @@ am__can_run_installinfo = \
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
diff --git a/lib-src/libsamplerate/autotools.patch b/lib-src/libsamplerate/autotools.patch
new file mode 100644
index 000000000..509ecff9d
--- /dev/null
+++ b/lib-src/libsamplerate/autotools.patch
@@ -0,0 +1,74 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 12937)
++++ configure.ac	(working copy)
+@@ -1,28 +1,24 @@
+ # Copyright (C) 2002-2008 Erik de Castro Lopo (erikd AT mega-nerd DOT com).
+ 
+ dnl Require autoconf version >= 2.57)
+-AC_PREREQ(2.57)
++AC_PREREQ([2.57])
+ 
+ AC_INIT([libsamplerate],[0.1.7],[erikd@mega-nerd.com])
+ 
+ # Put config stuff in Cfg.
+-AC_CONFIG_AUX_DIR(Cfg)
++AC_CONFIG_AUX_DIR([Cfg])
+ 
+ AC_CONFIG_SRCDIR([src/samplerate.c])
+ AC_CANONICAL_TARGET([])
+ 
+ AC_CONFIG_MACRO_DIR([M4])
+ 
+-AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
++AM_INIT_AUTOMAKE
+ dnl Audacity policy: don't enable automatic rebuild of configure et al if 
+ dnl sources change
+ AM_MAINTAINER_MODE([disable])
+ AC_CONFIG_HEADER(src/config.h)
+ 
+-
+-dnl Add parameters for aclocal
+-AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
+-
+ AC_LANG([C])
+ 
+ #------------------------------------------------------------------------------------
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 12937)
++++ Makefile.am	(working copy)
+@@ -1,5 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
++ACLOCAL_AMFLAGS = -I M4
++
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
+ 
+ SUBDIRS = src doc examples tests
+Index: examples/Makefile.am
+===================================================================
+--- examples/Makefile.am	(revision 12937)
++++ examples/Makefile.am	(working copy)
+@@ -6,7 +6,7 @@
+ noinst_PROGRAMS = varispeed-play timewarp-file
+ 
+ SAMPLERATEDIR =../src
+-INCLUDES = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@
++AM_CPPFLAGS = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@
+ 
+ OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
+ 
+Index: tests/Makefile.am
+===================================================================
+--- tests/Makefile.am	(revision 12937)
++++ tests/Makefile.am	(working copy)
+@@ -5,7 +5,7 @@
+ 					downsample_test
+ 
+ SAMPLRATEDIR =../src
+-INCLUDES = -I$(srcdir)/$(SAMPLRATEDIR)
++AM_CPPFLAGS = -I$(srcdir)/$(SAMPLRATEDIR)
+ noinst_HEADERS = util.h
+ 
+ #===============================================================================
diff --git a/lib-src/libsamplerate/configure b/lib-src/libsamplerate/configure
index 3a2efe214..fbf50d0d7 100755
--- a/lib-src/libsamplerate/configure
+++ b/lib-src/libsamplerate/configure
@@ -690,7 +690,6 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
-ACLOCAL_AMFLAGS
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -3069,9 +3068,8 @@ fi
 
 
 # Define the identity of the package.
-
- PACKAGE=$PACKAGE_NAME
- VERSION=$PACKAGE_VERSION
+ PACKAGE='libsamplerate'
+ VERSION='0.1.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3148,10 +3146,6 @@ fi
 ac_config_headers="$ac_config_headers src/config.h"
 
 
-
-ACLOCAL_AMFLAGS="-I M4"
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/lib-src/libsamplerate/configure.ac b/lib-src/libsamplerate/configure.ac
index bcbfa486d..e8e66c73d 100644
--- a/lib-src/libsamplerate/configure.ac
+++ b/lib-src/libsamplerate/configure.ac
@@ -1,28 +1,24 @@
 # Copyright (C) 2002-2008 Erik de Castro Lopo (erikd AT mega-nerd DOT com).
 
 dnl Require autoconf version >= 2.57)
-AC_PREREQ(2.57)
+AC_PREREQ([2.57])
 
 AC_INIT([libsamplerate],[0.1.7],[erikd@mega-nerd.com])
 
 # Put config stuff in Cfg.
-AC_CONFIG_AUX_DIR(Cfg)
+AC_CONFIG_AUX_DIR([Cfg])
 
 AC_CONFIG_SRCDIR([src/samplerate.c])
 AC_CANONICAL_TARGET([])
 
 AC_CONFIG_MACRO_DIR([M4])
 
-AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 dnl Audacity policy: don't enable automatic rebuild of configure et al if 
 dnl sources change
 AM_MAINTAINER_MODE([disable])
 AC_CONFIG_HEADER(src/config.h)
 
-
-dnl Add parameters for aclocal
-AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
-
 AC_LANG([C])
 
 #------------------------------------------------------------------------------------
diff --git a/lib-src/libsamplerate/doc/Makefile.in b/lib-src/libsamplerate/doc/Makefile.in
index 6698b85d0..eb114da04 100644
--- a/lib-src/libsamplerate/doc/Makefile.in
+++ b/lib-src/libsamplerate/doc/Makefile.in
@@ -117,7 +117,6 @@ am__can_run_installinfo = \
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
diff --git a/lib-src/libsamplerate/examples/Makefile.am b/lib-src/libsamplerate/examples/Makefile.am
index 6b509da5b..6a391c6bc 100644
--- a/lib-src/libsamplerate/examples/Makefile.am
+++ b/lib-src/libsamplerate/examples/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = sndfile-resample
 noinst_PROGRAMS = varispeed-play timewarp-file
 
 SAMPLERATEDIR =../src
-INCLUDES = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@
+AM_CPPFLAGS = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@
 
 OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
 
diff --git a/lib-src/libsamplerate/examples/Makefile.in b/lib-src/libsamplerate/examples/Makefile.in
index 566804174..86bc23c20 100644
--- a/lib-src/libsamplerate/examples/Makefile.in
+++ b/lib-src/libsamplerate/examples/Makefile.in
@@ -185,7 +185,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -320,7 +319,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SAMPLERATEDIR = ../src
-INCLUDES = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@
+AM_CPPFLAGS = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@
 AM_CFLAGS = @SNDFILE_CFLAGS@
 
 #===============================================================================
diff --git a/lib-src/libsamplerate/src/Makefile.in b/lib-src/libsamplerate/src/Makefile.in
index 35a176231..0cc42e945 100644
--- a/lib-src/libsamplerate/src/Makefile.in
+++ b/lib-src/libsamplerate/src/Makefile.in
@@ -209,7 +209,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
diff --git a/lib-src/libsamplerate/tests/Makefile.am b/lib-src/libsamplerate/tests/Makefile.am
index 7cc50bc0a..c545e547a 100644
--- a/lib-src/libsamplerate/tests/Makefile.am
+++ b/lib-src/libsamplerate/tests/Makefile.am
@@ -5,7 +5,7 @@ noinst_PROGRAMS = misc_test termination_test simple_test callback_test \
 					downsample_test
 
 SAMPLRATEDIR =../src
-INCLUDES = -I$(srcdir)/$(SAMPLRATEDIR)
+AM_CPPFLAGS = -I$(srcdir)/$(SAMPLRATEDIR)
 noinst_HEADERS = util.h
 
 #===============================================================================
diff --git a/lib-src/libsamplerate/tests/Makefile.in b/lib-src/libsamplerate/tests/Makefile.in
index 5c81a040e..fcc320bcb 100644
--- a/lib-src/libsamplerate/tests/Makefile.in
+++ b/lib-src/libsamplerate/tests/Makefile.in
@@ -276,7 +276,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -411,7 +410,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SAMPLRATEDIR = ../src
-INCLUDES = -I$(srcdir)/$(SAMPLRATEDIR)
+AM_CPPFLAGS = -I$(srcdir)/$(SAMPLRATEDIR)
 noinst_HEADERS = util.h
 
 #===============================================================================