diff --git a/android/apetag.mk b/android/apetag.mk
index 217ae8a272..10ce6f95be 100644
--- a/android/apetag.mk
+++ b/android/apetag.mk
@@ -10,14 +10,14 @@ apetag_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(apetag_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-	libgsttag-0.10          \
-	libgstpbutils-0.10
+	libgsttag-0.11          \
+	libgstpbutils-0.11
 
 LOCAL_MODULE:= libgstapetag
 
@@ -26,7 +26,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/..         			\
     $(LOCAL_PATH)/../gst-libs 			\
     $(LOCAL_PATH)  						\
-	$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+	$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
     $(TARGET_OUT_HEADERS)/glib-2.0      \
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -43,7 +43,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/avi.mk b/android/avi.mk
index 9ff2132acd..978fc062d7 100644
--- a/android/avi.mk
+++ b/android/avi.mk
@@ -13,13 +13,13 @@ avi_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(avi_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-	libgstriff-0.10
+	libgstriff-0.11
 
 LOCAL_MODULE:= libgstavi
 
@@ -29,7 +29,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../gst-libs 			\
 	$(LOCAL_PATH)/  					\
     $(LOCAL_PATH)/gst-libs/gst/audio    \
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+    $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
 	$(TARGET_OUT_HEADERS)/glib-2.0 		\
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -45,7 +45,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/flv.mk b/android/flv.mk
index f59b7bc71d..6c4bc75f02 100644
--- a/android/flv.mk
+++ b/android/flv.mk
@@ -12,8 +12,8 @@ flv_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(flv_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-	libgstreamer-0.10     \
-    libgstbase-0.10       \
+	libgstreamer-0.11     \
+    libgstbase-0.11       \
     libglib-2.0           \
     libgthread-2.0        \
     libgmodule-2.0        \
@@ -28,7 +28,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/..         			\
     $(LOCAL_PATH)/../gst-libs 			\
 	$(LOCAL_PATH)  						\
-	$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+	$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
     $(TARGET_OUT_HEADERS)/glib-2.0      \
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -44,7 +44,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/icydemux.mk b/android/icydemux.mk
index 4819a9b0c5..a491a6256c 100644
--- a/android/icydemux.mk
+++ b/android/icydemux.mk
@@ -10,13 +10,13 @@ icydemux_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(icydemux_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-	libgsttag-0.10 			
+	libgsttag-0.11 			
 
 LOCAL_MODULE:= libgsticydemux
 
@@ -25,7 +25,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/..         	  		\
     $(LOCAL_PATH)/../gst-libs       	\
 	$(LOCAL_PATH)      					\
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+    $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
 	$(TARGET_OUT_HEADERS)/glib-2.0 		\
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -41,7 +41,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/id3demux.mk b/android/id3demux.mk
index c615eb06e8..610b65f573 100644
--- a/android/id3demux.mk
+++ b/android/id3demux.mk
@@ -12,14 +12,14 @@ id3demux_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(id3demux_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-	libgsttag-0.10          \
-	libgstpbutils-0.10
+	libgsttag-0.11          \
+	libgstpbutils-0.11
 
 LOCAL_MODULE:= libgstid3demux
 
@@ -28,7 +28,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/..         			\
     $(LOCAL_PATH)/../gst-libs 			\
     $(LOCAL_PATH)  						\
-	$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+	$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
     $(TARGET_OUT_HEADERS)/glib-2.0      \
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -44,7 +44,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/qtdemux.mk b/android/qtdemux.mk
index 3708dd3ac5..7ef99eef84 100644
--- a/android/qtdemux.mk
+++ b/android/qtdemux.mk
@@ -14,16 +14,16 @@ qtdemux_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(qtdemux_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-	libgsttag-0.10 			\
-	libgstrtp-0.10 			\
-	libgstriff-0.10 		\
-	libgstaudio-0.10
+	libgsttag-0.11 			\
+	libgstrtp-0.11 			\
+	libgstriff-0.11 		\
+	libgstaudio-0.11
 
 LOCAL_MODULE:= libgstqtdemux
 
@@ -32,7 +32,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/..         	  		\
     $(LOCAL_PATH)/../gst-libs       	\
 	$(LOCAL_PATH)      					\
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+    $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
 	$(TARGET_OUT_HEADERS)/glib-2.0 		\
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -48,7 +48,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/rtp.mk b/android/rtp.mk
index 331c59833e..57dfc3a89d 100644
--- a/android/rtp.mk
+++ b/android/rtp.mk
@@ -74,15 +74,15 @@ rtp_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(rtp_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-	libgstreamer-0.10 		\
-	libgstbase-0.10 		\
+	libgstreamer-0.11 		\
+	libgstbase-0.11 		\
 	libglib-2.0    			\
 	libgthread-2.0 			\
 	libgmodule-2.0 			\
 	libgobject-2.0 			\
-	libgsttag-0.10 			\
-	libgstrtp-0.10 			\
-	libgstaudio-0.10
+	libgsttag-0.11 			\
+	libgstrtp-0.11 			\
+	libgstaudio-0.11
 
 LOCAL_MODULE:= libgstrtp
 
@@ -91,7 +91,7 @@ LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/..         			\
 	$(LOCAL_PATH)/../gst-libs 			\
 	$(LOCAL_PATH)  						\
-	$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+	$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
 	$(TARGET_OUT_HEADERS)/glib-2.0 		\
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -107,7 +107,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/rtpmanager.mk b/android/rtpmanager.mk
index f7aa66778a..148a4cd6e9 100644
--- a/android/rtpmanager.mk
+++ b/android/rtpmanager.mk
@@ -22,14 +22,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(rtpmanager_LOCAL_SRC_FILES_BASE)) \
 				  $(addprefix ../android/,$(rtpmanager_LOCAL_SRC_FILES_ANDROID))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-	libgstnetbuffer-0.10    \
-	libgstrtp-0.10
+	libgstnetbuffer-0.11    \
+	libgstrtp-0.11
 
 LOCAL_MODULE:= libgstrtpmanager
 
@@ -39,7 +39,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../gst-libs       	\
 	$(LOCAL_PATH)          				\
 	$(LOCAL_PATH)/gst/rtpmanager 		\
-	$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+	$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
 	$(TARGET_OUT_HEADERS)/glib-2.0 		\
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -55,7 +55,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/rtsp.mk b/android/rtsp.mk
index cb2c7d2cc4..29f890672f 100644
--- a/android/rtsp.mk
+++ b/android/rtsp.mk
@@ -13,16 +13,16 @@ rtsp_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(rtsp_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-	libgstrtp-0.10   		\
-	libgstinterfaces-0.10   \
-	libgstrtsp-0.10         \
-	libgstsdp-0.10
+	libgstrtp-0.11   		\
+	libgstinterfaces-0.11   \
+	libgstrtsp-0.11         \
+	libgstsdp-0.11
 
 LOCAL_MODULE:= libgstrtsp
 
@@ -31,7 +31,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/..         			\
     $(LOCAL_PATH)/../gst-libs 			\
 	$(LOCAL_PATH)      					\
-	$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+	$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
 	$(TARGET_OUT_HEADERS)/glib-2.0 		\
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -47,7 +47,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/soup.mk b/android/soup.mk
index e869a2548b..29d9d14528 100644
--- a/android/soup.mk
+++ b/android/soup.mk
@@ -10,13 +10,13 @@ soup_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(soup_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-	libgsttag-0.10          \
+	libgsttag-0.11          \
 	libsoup-2.4
 
 LOCAL_MODULE:= libgstsouphttpsrc
@@ -26,7 +26,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/..         			\
     $(LOCAL_PATH)/../gst-libs 			\
 	$(LOCAL_PATH)      					\
-	$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+	$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
 	$(TARGET_OUT_HEADERS)/glib-2.0 		\
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include       		\
@@ -43,7 +43,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/udp.mk b/android/udp.mk
index 1139a4a0f8..6a522bcad2 100644
--- a/android/udp.mk
+++ b/android/udp.mk
@@ -19,14 +19,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(udp_LOCAL_SRC_FILES_BASE)) \
 				  $(addprefix ../android/,$(udp_LOCAL_SRC_FILES_ANDROID))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-	libgsttag-0.10 			\
-	libgstnetbuffer-0.10
+	libgsttag-0.11 			\
+	libgstnetbuffer-0.11
 
 LOCAL_MODULE:= libgstudp
 
@@ -36,7 +36,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../gst-libs 			\
 	$(LOCAL_PATH)      					\
 	$(LOCAL_PATH)/gst/udp    			\
-	$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+	$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
 	$(TARGET_OUT_HEADERS)/glib-2.0 		\
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -52,7 +52,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/wavenc.mk b/android/wavenc.mk
index a3fc824df4..5ba7769082 100644
--- a/android/wavenc.mk
+++ b/android/wavenc.mk
@@ -10,13 +10,13 @@ wavenc_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(wavenc_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-    libgstriff-0.10		
+    libgstriff-0.11		
 
 LOCAL_MODULE:= libgstwavenc
 
@@ -25,7 +25,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/..         	  		\
     $(LOCAL_PATH)/../gst-libs       	\
 	$(LOCAL_PATH)      					\
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+    $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
 	$(TARGET_OUT_HEADERS)/glib-2.0 		\
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -41,7 +41,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/wavparse.mk b/android/wavparse.mk
index 2447bb6225..d10a7b090a 100644
--- a/android/wavparse.mk
+++ b/android/wavparse.mk
@@ -10,13 +10,13 @@ wavparse_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(wavparse_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
+    libgstreamer-0.11       \
+    libgstbase-0.11         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-	libgstriff-0.10
+	libgstriff-0.11
 
 LOCAL_MODULE:= libgstwavparse
 
@@ -25,7 +25,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/..         			\
     $(LOCAL_PATH)/../gst-libs 			\
 	$(LOCAL_PATH)      					\
-	$(TARGET_OUT_HEADERS)/gstreamer-0.10 \
+	$(TARGET_OUT_HEADERS)/gstreamer-0.11 \
 	$(TARGET_OUT_HEADERS)/glib-2.0 	  	\
     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
 	external/libxml2/include
@@ -41,7 +41,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 #
 LOCAL_PRELINK_MODULE := false
 
-#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/configure.ac b/configure.ac
index 99210c61c3..5709092c55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1233,7 +1233,7 @@ sed \
     -e "s/.* PACKAGE_STRING$/#define PACKAGE_STRING \"$PACKAGE_STRING\"/" \
     -e 's/.* PACKAGE_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \
     -e 's/.* PACKAGE_VERSION$/#define PACKAGE_VERSION "'$PACKAGE_VERSION'"/' \
-    -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n#  define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.10"\n#else\n#  define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.10"\n#endif/' \
+    -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n#  define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.11"\n#else\n#  define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.11"\n#endif/' \
     -e 's/.* USE_BINARY_REGISTRY$/#define USE_BINARY_REGISTRY/' \
     -e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \
     -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directaudiosink\"/" \