diff --git a/Makefile.am b/Makefile.am
index 5dbe98b3ea..9ebbf89cf7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,11 +146,10 @@ CORE_CFLAGS    += -I$(switch_srcdir)/libs/pcre
 CORE_CFLAGS    += -I$(switch_srcdir)/libs/speex/include
 CORE_CFLAGS    += -I$(switch_srcdir)/libs/srtp/include
 CORE_CFLAGS    += -I$(switch_srcdir)/libs/srtp/crypto/include
-CORE_CFLAGS    += $(RESAMPLE_CFLAGS)
 
 CORE_LIBS      = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la
 CORE_LIBS     += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la libs/speex/libspeex/libspeexdsp.la
-CORE_LIBS     += libs/srtp/libsrtp.la $(RESAMPLE_LIB)
+CORE_LIBS     += libs/srtp/libsrtp.la
 
 lib_LTLIBRARIES	          = libfreeswitch.la
 libfreeswitch_la_CFLAGS   = $(CORE_CFLAGS) $(AM_CFLAGS)
@@ -310,12 +309,6 @@ libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update
 	@cd libs/srtp && $(MAKE)
 	@$(TOUCH_TARGET)
 
-if USE_INTREE_RESAMPLE
-libs/libresample/libresample.la: libs/libresample libs/libresample/.update
-	@cd libs/libresample && $(MAKE)
-	@$(TOUCH_TARGET)
-endif
-
 core:
 	$(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la
 
diff --git a/configure.in b/configure.in
index 6076cb7131..2487cdbc67 100644
--- a/configure.in
+++ b/configure.in
@@ -88,27 +88,6 @@ if test "${enable_optimizer}" = "yes" ; then
         AX_CC_MAXOPT
 fi
 
-
-# Optional Features
-
-AC_ARG_ENABLE(resample,
-[AC_HELP_STRING([--disable-resample],[build without embedded resampler])],[enable_resample="$enableval"],[enable_resample="yes"])
-
-# We should add checking for out of tree libresample here
-RESAMPLE_LIB=
-RESAMPLE_CFLAGS=
-if test "${enable_resample}" = "yes"; then
-       RESAMPLE_LIB="libs/libresample/libresample.la"
-       RESAMPLE_CFLAGS="-I${switch_srcdir}/libs/libresample/include"
-else
-        AC_DEFINE([DISABLE_RESAMPLE],[],[Disable the embedded resampler])
-fi
-
-AC_SUBST(RESAMPLE_LIB)
-AC_SUBST(RESAMPLE_CFLAGS)
-
-AM_CONDITIONAL([USE_INTREE_RESAMPLE],[test "${enable_resample}" = "yes"])
-
 # set defaults for use on all platforms
 SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src"
 SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src"