diff --git a/lib-src/audacity-patches.txt b/lib-src/audacity-patches.txt
index 3a670b70b..58252549c 100644
--- a/lib-src/audacity-patches.txt
+++ b/lib-src/audacity-patches.txt
@@ -235,6 +235,7 @@ http://www.surina.net/soundtouch/
 Independant Pitch and Tempo changing library.
 Version in Audacity SVN: 1.7.1
 Patches: autotools.patch: Fix all autotools warnings.
+AM_MAINTAINER_MODE([disable]) has been added to configure.ac to disable autotools rebuilds.
 Upstream Version: 1.7.1
 
 taglib
diff --git a/lib-src/soundtouch/configure.ac b/lib-src/soundtouch/configure.ac
index e845b824a..e340f64ea 100644
--- a/lib-src/soundtouch/configure.ac
+++ b/lib-src/soundtouch/configure.ac
@@ -24,6 +24,7 @@ AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([config/m4])
 AM_CONFIG_HEADER([include/soundtouch_config.h])
 AM_INIT_AUTOMAKE
+AM_MAINTAINER_MODE([disable])
 #AC_DISABLE_SHARED	dnl This makes libtool only build static libs 
 AC_DISABLE_STATIC	dnl This makes libtool only build shared libs
 #AC_GNU_SOURCE 		dnl enable posix extensions in glibc
@@ -57,14 +58,14 @@ dnl ############################################################################
 AC_HEADER_STDC
 #AC_HEADER_SYS_WAIT
 #	add any others you want to check for here
-AC_CHECK_HEADERS([cpuid.h])
+AC_CHECK_HEADERS([cpuid.h])
 
-if test "x$ac_cv_header_cpuid_h" = "xno"; then
-	AC_MSG_WARN([The cpuid.h file was not found therefore the x86 optimizations will be disabled.])
-	AC_MSG_WARN([If using a x86 architecture and optimizations are desired then please install gcc (>= 4.3).])
-	AC_MSG_WARN([If using a non-x86 architecture then this is expected and can be ignored.])
-fi
- 
+if test "x$ac_cv_header_cpuid_h" = "xno"; then
+	AC_MSG_WARN([The cpuid.h file was not found therefore the x86 optimizations will be disabled.])
+	AC_MSG_WARN([If using a x86 architecture and optimizations are desired then please install gcc (>= 4.3).])
+	AC_MSG_WARN([If using a non-x86 architecture then this is expected and can be ignored.])
+fi
+ 
 
 dnl ############################################################################
 dnl # Checks for typedefs, structures, and compiler characteristics            $
@@ -106,7 +107,7 @@ fi
 
 
 # Check if optimizations are supported in the system at build time.
-if test "x$enable_x86_optimizations" = "xyes" -a "x$ac_cv_header_cpuid_h" = "xyes"; then
+if test "x$enable_x86_optimizations" = "xyes" -a "x$ac_cv_header_cpuid_h" = "xyes"; then
         echo "****** x86 optimizations enabled ******"
 
 	original_saved_CXXFLAGS=$CXXFLAGS