diff --git a/configure.ac b/configure.ac
index 584c04c947..7736d98239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -333,6 +333,28 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
   ["${srcdir}/gst-plugins-base.doap"],
   [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO])
 
+dnl build static plugins or not
+AC_MSG_CHECKING([whether to build static plugins or not])
+AC_ARG_ENABLE(
+  static-plugins,
+  AC_HELP_STRING(
+    [--enable-static-plugins],
+    [build static plugins @<:@default=no@:>@]),
+  [AS_CASE(
+    [$enableval], [no], [], [yes], [],
+    [AC_MSG_ERROR([bad value "$enableval" for --enable-static-plugins])])],
+  [enable_static_plugins=no])
+AC_MSG_RESULT([$enable_static_plugins])
+if test "x$enable_static_plugins" = xyes; then
+  AC_DEFINE(GST_PLUGIN_BUILD_STATIC, 1,
+    [Define if static plugins should be built])
+  GST_PLUGIN_LIBTOOLFLAGS=""
+else
+  GST_PLUGIN_LIBTOOLFLAGS="--tag=disable-static"
+fi
+AC_SUBST(GST_PLUGIN_LIBTOOLFLAGS)
+AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static_plugins" = "xyes")
+
 # set by AG_GST_PARSE_SUBSYSTEM_DISABLES above
 dnl make sure it doesn't complain about unused variables if debugging is disabled
 NO_WARNINGS=""
@@ -805,7 +827,7 @@ AC_SUBST(GST_LIB_LDFLAGS)
 
 dnl this really should only contain flags, not libs - they get added before
 dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc.*' $GST_ALL_LDFLAGS"
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_.*' $GST_ALL_LDFLAGS"
 AC_SUBST(GST_PLUGIN_LDFLAGS)
 
 dnl *** output files ***
diff --git a/ext/alsa/Makefile.am b/ext/alsa/Makefile.am
index 1c6acf6f82..9a2225784f 100644
--- a/ext/alsa/Makefile.am
+++ b/ext/alsa/Makefile.am
@@ -18,7 +18,7 @@ libgstalsa_la_LIBADD = \
 	$(ALSA_LIBS)
 
 libgstalsa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstalsa_la_LIBTOOLFLAGS = --tag=disable-static
+libgstalsa_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstalsa.h \
diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am
index f4690a6a32..86c3842c0a 100644
--- a/ext/cdparanoia/Makefile.am
+++ b/ext/cdparanoia/Makefile.am
@@ -12,6 +12,6 @@ libgstcdparanoia_la_LIBADD = \
 	$(GST_LIBS) \
 	$(CDPARANOIA_LIBS)
 libgstcdparanoia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcdparanoia_la_LIBTOOLFLAGS = --tag=disable-static
+libgstcdparanoia_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstcdparanoiasrc.h
diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am
index 07eec1a506..a996b8ea27 100644
--- a/ext/libvisual/Makefile.am
+++ b/ext/libvisual/Makefile.am
@@ -7,6 +7,6 @@ libgstlibvisual_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \
 	$(GST_BASE_LIBS) $(LIBVISUAL_LIBS)
 libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstlibvisual_la_LIBTOOLFLAGS = --tag=disable-static
+libgstlibvisual_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = visual.h gstaudiovisualizer.h
diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am
index f9ed4ed780..2fa9a30ac2 100644
--- a/ext/ogg/Makefile.am
+++ b/ext/ogg/Makefile.am
@@ -27,7 +27,7 @@ libgstogg_la_LIBADD = \
 	$(GST_LIBS) \
 	$(OGG_LIBS)
 libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstogg_la_LIBTOOLFLAGS = --tag=disable-static
+libgstogg_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
diff --git a/ext/pango/Makefile.am b/ext/pango/Makefile.am
index 0109e014b8..7ecfbdabb0 100644
--- a/ext/pango/Makefile.am
+++ b/ext/pango/Makefile.am
@@ -25,5 +25,5 @@ libgstpango_la_LIBADD = \
 	$(GST_LIBS) \
 	$(PANGO_LIBS)
 libgstpango_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstpango_la_LIBTOOLFLAGS = --tag=disable-static
+libgstpango_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
diff --git a/ext/theora/Makefile.am b/ext/theora/Makefile.am
index ff423a9e40..b1202a8ff1 100644
--- a/ext/theora/Makefile.am
+++ b/ext/theora/Makefile.am
@@ -17,5 +17,5 @@ libgsttheora_la_LIBADD = \
 	$(GST_LIBS) \
 	$(THEORA_LIBS)
 libgsttheora_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsttheora_la_LIBTOOLFLAGS = --tag=disable-static
+libgsttheora_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am
index b97029e0de..41062bb554 100644
--- a/ext/vorbis/Makefile.am
+++ b/ext/vorbis/Makefile.am
@@ -20,7 +20,7 @@ libgstvorbis_la_LIBADD = \
 	$(GST_LIBS) \
 	$(VORBIS_LIBS) $(VORBISENC_LIBS)
 libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvorbis_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvorbis_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 endif
 
 if USE_IVORBIS
@@ -36,7 +36,7 @@ libgstivorbisdec_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
 	$(GST_LIBS) $(IVORBIS_LIBS)
 libgstivorbisdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstivorbisdec_la_LIBTOOLFLAGS = --tag=disable-static
+libgstivorbisdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 endif
 
 noinst_HEADERS = gstvorbisenc.h \
diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
index 46170fbc4b..54f35fb3fd 100644
--- a/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@ -19,7 +19,7 @@ libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstapp_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS)
 libgstapp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
-libgstapp_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=disable-static
+libgstapp_@GST_API_VERSION@_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 libgstapp_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/app
 libgstapp_@GST_API_VERSION@include_HEADERS = \
diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am
index a29eefc17d..c899cfc388 100644
--- a/gst/adder/Makefile.am
+++ b/gst/adder/Makefile.am
@@ -11,7 +11,7 @@ libgstadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstadder_la_LIBADD =  \
 	         $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
 		 $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
-libgstadder_la_LIBTOOLFLAGS = --tag=disable-static
+libgstadder_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstadder.h
 
diff --git a/gst/app/Makefile.am b/gst/app/Makefile.am
index 5e344a6133..f2bb6f0649 100644
--- a/gst/app/Makefile.am
+++ b/gst/app/Makefile.am
@@ -4,7 +4,7 @@ libgstapp_la_SOURCES = gstapp.c
 libgstapp_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
 libgstapp_la_LIBADD = $(GST_BASE_LIBS) $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_API_VERSION@.la
 libgstapp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstapp_la_LIBTOOLFLAGS = --tag=disable-static
+libgstapp_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am
index a61c86ed22..66846fc513 100644
--- a/gst/audioconvert/Makefile.am
+++ b/gst/audioconvert/Makefile.am
@@ -16,7 +16,7 @@ libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudioconvert_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
-libgstaudioconvert_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaudioconvert_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstaudioconvert.h \
diff --git a/gst/audiorate/Makefile.am b/gst/audiorate/Makefile.am
index 557d1c8619..9c21d07310 100644
--- a/gst/audiorate/Makefile.am
+++ b/gst/audiorate/Makefile.am
@@ -8,7 +8,7 @@ libgstaudiorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudiorate_la_LIBADD = $(GST_LIBS) \
         $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la
 
-libgstaudiorate_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaudiorate_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/audioresample/Makefile.am b/gst/audioresample/Makefile.am
index 0c7e871c7c..aad8f46f32 100644
--- a/gst/audioresample/Makefile.am
+++ b/gst/audioresample/Makefile.am
@@ -27,7 +27,7 @@ libgstaudioresample_la_LIBADD = \
 	$(LIBM)
 
 libgstaudioresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaudioresample_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaudioresample_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	arch.h \
diff --git a/gst/audiotestsrc/Makefile.am b/gst/audiotestsrc/Makefile.am
index a7c019defb..3680d20bb1 100644
--- a/gst/audiotestsrc/Makefile.am
+++ b/gst/audiotestsrc/Makefile.am
@@ -6,7 +6,7 @@ libgstaudiotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudiotestsrc_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
-libgstaudiotestsrc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaudiotestsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstaudiotestsrc.h
 
diff --git a/gst/encoding/Makefile.am b/gst/encoding/Makefile.am
index f1b4e5fa91..85efbd144c 100644
--- a/gst/encoding/Makefile.am
+++ b/gst/encoding/Makefile.am
@@ -11,7 +11,7 @@ libgstencodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstencodebin_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \
 	$(GST_LIBS)
-libgstencodebin_la_LIBTOOLFLAGS = --tag=disable-static
+libgstencodebin_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = 		\
 	gstencodebin.h		\
diff --git a/gst/gio/Makefile.am b/gst/gio/Makefile.am
index f4b1611b37..111dfb1791 100644
--- a/gst/gio/Makefile.am
+++ b/gst/gio/Makefile.am
@@ -15,7 +15,7 @@ libgstgio_la_SOURCES = \
 libgstgio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
 libgstgio_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS)
 libgstgio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GIO_LDFLAGS)
-libgstgio_la_LIBTOOLFLAGS = --tag=disable-static
+libgstgio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS = \
diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am
index 61c60b0593..24e6b164f5 100644
--- a/gst/playback/Makefile.am
+++ b/gst/playback/Makefile.am
@@ -23,7 +23,7 @@ libgstplayback_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
 	$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \
 	$(GST_LIBS)
-libgstplayback_la_LIBTOOLFLAGS = --tag=disable-static
+libgstplayback_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstplayback.h \
diff --git a/gst/subparse/Makefile.am b/gst/subparse/Makefile.am
index 4a33bd419f..40c4be4db0 100644
--- a/gst/subparse/Makefile.am
+++ b/gst/subparse/Makefile.am
@@ -22,7 +22,7 @@ libgstsubparse_la_SOURCES = \
 libgstsubparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 libgstsubparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsubparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
-libgstsubparse_la_LIBTOOLFLAGS = --tag=disable-static
+libgstsubparse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstssaparse.h \
diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am
index 9117f4e723..22973fa2c0 100644
--- a/gst/tcp/Makefile.am
+++ b/gst/tcp/Makefile.am
@@ -34,7 +34,7 @@ nodist_libgsttcp_la_SOURCES = \
 libgsttcp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
 libgsttcp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsttcp_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS)
-libgsttcp_la_LIBTOOLFLAGS = --tag=disable-static
+libgsttcp_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
   gsttcp.h \
diff --git a/gst/typefind/Makefile.am b/gst/typefind/Makefile.am
index 4dfda7c5b9..414b55d62c 100644
--- a/gst/typefind/Makefile.am
+++ b/gst/typefind/Makefile.am
@@ -9,7 +9,7 @@ libgsttypefindfunctions_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS)
 
-libgsttypefindfunctions_la_LIBTOOLFLAGS = --tag=disable-static
+libgsttypefindfunctions_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/videoconvert/Makefile.am b/gst/videoconvert/Makefile.am
index b17b134710..aed82d4bab 100644
--- a/gst/videoconvert/Makefile.am
+++ b/gst/videoconvert/Makefile.am
@@ -16,7 +16,7 @@ libgstvideoconvert_la_LIBADD = \
 	$(ORC_LIBS) \
 	$(LIBM)
 libgstvideoconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideoconvert_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideoconvert_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvideoconvert.h videoconvert.h gstcms.h
 
diff --git a/gst/videorate/Makefile.am b/gst/videorate/Makefile.am
index b275abab99..d950ad9840 100644
--- a/gst/videorate/Makefile.am
+++ b/gst/videorate/Makefile.am
@@ -6,7 +6,7 @@ libgstvideorate_la_SOURCES = gstvideorate.c
 libgstvideorate_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 libgstvideorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideorate_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
-libgstvideorate_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideorate_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am
index ecd3c9bc9f..5d96422cc7 100644
--- a/gst/videoscale/Makefile.am
+++ b/gst/videoscale/Makefile.am
@@ -18,7 +18,7 @@ libgstvideoscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideoscale_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
-libgstvideoscale_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideoscale_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstvideoscale.h \
diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am
index 5096b9b1b1..52230f2c34 100644
--- a/gst/videotestsrc/Makefile.am
+++ b/gst/videotestsrc/Makefile.am
@@ -13,7 +13,7 @@ libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideotestsrc_la_LIBADD = 	\
 	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
-libgstvideotestsrc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideotestsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvideotestsrc.h videotestsrc.h
 
diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am
index be5f736838..bb83001adc 100644
--- a/gst/volume/Makefile.am
+++ b/gst/volume/Makefile.am
@@ -12,7 +12,7 @@ libgstvolume_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(ORC_LIBS)
-libgstvolume_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvolume_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvolume.h
 
diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am
index d7f239058b..5d113f9f1e 100644
--- a/sys/ximage/Makefile.am
+++ b/sys/ximage/Makefile.am
@@ -8,6 +8,6 @@ libgstximagesink_la_LIBADD = \
 	$(X_LIBS) $(XSHM_LIBS)
 libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstximagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la
-libgstximagesink_la_LIBTOOLFLAGS = --tag=disable-static
+libgstximagesink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = ximagesink.h ximagepool.h
diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am
index 170b7b83aa..9dd9bef3e1 100644
--- a/sys/xvimage/Makefile.am
+++ b/sys/xvimage/Makefile.am
@@ -9,6 +9,6 @@ libgstxvimagesink_la_LIBADD = \
 	$(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) $(LIBM)
 libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstxvimagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la
-libgstxvimagesink_la_LIBTOOLFLAGS = --tag=disable-static
+libgstxvimagesink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = xvimagesink.h xvimagepool.h