diff --git a/Makefile.am b/Makefile.am
index 1001ad2..4defec5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -350,29 +350,6 @@ EXTRA_DIST += src/genbuiltin src/bluetooth.conf src/org.bluez.service \
 			audio/telephony-maemo6.c profiles/sap/sap-dummy.c \
 			profiles/sap/sap-u8500.c
 
-if AUDIOPLUGIN
-if GSTREAMER
-gstreamerdir = $(libdir)/gstreamer-0.10
-
-gstreamer_LTLIBRARIES = audio/libgstbluetooth.la
-
-audio_libgstbluetooth_la_SOURCES = audio/gstbluetooth.c audio/gstpragma.h \
-				audio/gstsbcenc.h audio/gstsbcenc.c \
-				audio/gstsbcdec.h audio/gstsbcdec.c \
-				audio/gstsbcparse.h audio/gstsbcparse.c \
-				audio/gstavdtpsink.h audio/gstavdtpsink.c \
-				audio/gsta2dpsink.h audio/gsta2dpsink.c \
-				audio/gstsbcutil.h audio/gstsbcutil.c audio/rtp.h \
-				audio/gstrtpsbcpay.h audio/gstrtpsbcpay.c
-audio_libgstbluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la lib/libbluetooth-private.la \
-						@DBUS_LIBS@ @GSTREAMER_LIBS@ \
-						-lgstaudio-0.10 -lgstrtp-0.10
-audio_libgstbluetooth_la_CFLAGS = -fvisibility=hidden -fno-strict-aliasing \
-                               $(AM_CFLAGS) @DBUS_CFLAGS@ @GSTREAMER_CFLAGS@
-endif
-endif
-
 include Makefile.tools
 
 if DATAFILES
diff --git a/acinclude.m4 b/acinclude.m4
index ddc8183..636916d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -105,15 +105,6 @@ AC_DEFUN([AC_PATH_GLIB], [
 	AC_SUBST(GLIB_LIBS)
 ])
 
-AC_DEFUN([AC_PATH_GSTREAMER], [
-	PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10, gstreamer_found=yes,
-				AC_MSG_WARN(GStreamer library version 0.10.30 or later is required);gstreamer_found=no)
-	AC_SUBST(GSTREAMER_CFLAGS)
-	AC_SUBST(GSTREAMER_LIBS)
-	GSTREAMER_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir gstreamer-0.10`
-	AC_SUBST(GSTREAMER_PLUGINSDIR)
-])
-
 AC_DEFUN([AC_PATH_USB], [
 	PKG_CHECK_MODULES(USB, libusb, usb_found=yes, usb_found=no)
 	AC_SUBST(USB_CFLAGS)
@@ -168,7 +159,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	pie_enable=yes
 	sndfile_enable=${sndfile_found}
 	usb_enable=${usb_found}
-	gstreamer_enable=${gstreamer_found}
 	audio_enable=yes
 	input_enable=yes
 	network_enable=yes
@@ -232,10 +222,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 		health_enable=${enableval}
 	])
 
-	AC_ARG_ENABLE(gstreamer, AC_HELP_STRING([--enable-gstreamer], [enable GStreamer support]), [
-		gstreamer_enable=${enableval}
-	])
-
 	AC_ARG_ENABLE(usb, AC_HELP_STRING([--enable-usb], [enable USB support]), [
 		usb_enable=${enableval}
 	])
@@ -333,8 +319,8 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 
 	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
 	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
-	AM_CONDITIONAL(SBC, test "${gstreamer_enable}" = "yes" || test "${test_enable}" = "yes")
-	AM_CONDITIONAL(GSTREAMER, test "${gstreamer_enable}" = "yes" && test "${gstreamer_found}" = "yes")
+	AM_CONDITIONAL(SBC, test "${test_enable}" = "yes")
+
 	AM_CONDITIONAL(AUDIOPLUGIN, test "${audio_enable}" = "yes")
 	AM_CONDITIONAL(INPUTPLUGIN, test "${input_enable}" = "yes")
 	AM_CONDITIONAL(NETWORKPLUGIN, test "${network_enable}" = "yes")
diff --git a/configure.ac b/configure.ac
index 1f0dc74..150eeeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,6 @@ AC_CHECK_HEADER([sys/inotify.h],
 			[AC_MSG_ERROR(inotify headers are required and missing)])
 AC_PATH_DBUS
 AC_PATH_GLIB
-AC_PATH_GSTREAMER
 AC_PATH_USB
 AC_PATH_UDEV
 AC_PATH_SNDFILE