diff --git a/configure.ac b/configure.ac
index e671123b86..cbf2c7b1e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,6 +328,11 @@ dnl FIXME: maybe move to sys, or make work with winsock2
 AC_CHECK_HEADERS([sys/socket.h], HAVE_SYS_SOCKET_H=yes)
 AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)
 
+if test "x$HAVE_WINSOCK2_H" = "xyes"; then
+  WIN32_LIBS="-lws2_32"
+  AC_SUBST(WIN32_LIBS)
+fi
+
 dnl needed for festival
 AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes")
 
diff --git a/sys/acmenc/Makefile.am b/sys/acmenc/Makefile.am
index 587868bd5b..eb1b603a66 100644
--- a/sys/acmenc/Makefile.am
+++ b/sys/acmenc/Makefile.am
@@ -1,10 +1,16 @@
-plugin_LTLIBRARIES = libgstacmencsink.la
-
-libgstacmencsink_la_SOURCES = acmenc.c
-libgstacmencsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) $(ACMENC_CFLAGS)
-libgstacmencsink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-	-lgstriff-$(GST_MAJORMINOR) -lmsacm32
-libgstacmencsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstacmencsink_la_LIBTOOLFLAGS = --tag=disable-static
-
+plugin_LTLIBRARIES = libgstacmenc.la
+
+libgstacmenc_la_SOURCES = acmenc.c
+libgstacmenc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) $(ACMENC_CFLAGS)
+libgstacmenc_la_LIBADD =     \
+    $(GST_BASE_LIBS)             \
+    $(GST_PLUGINS_BASE_LIBS)     \
+    -lgstriff-$(GST_MAJORMINOR)  \
+    -lgstaudio-$(GST_MAJORMINOR) \
+    -lgsttag-$(GST_MAJORMINOR)   \
+    -lmsacm32
+
+libgstacmenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstacmenc_la_LIBTOOLFLAGS = --tag=disable-static
+
diff --git a/sys/acmmp3dec/Makefile.am b/sys/acmmp3dec/Makefile.am
index c1a28e75f9..27c895c545 100644
--- a/sys/acmmp3dec/Makefile.am
+++ b/sys/acmmp3dec/Makefile.am
@@ -1,9 +1,14 @@
-plugin_LTLIBRARIES = libgstacmmp3dec.la
-
-libgstacmmp3dec_la_SOURCES = acmmp3dec.c
-libgstacmmp3dec_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) $(ACMMP3DEC_CFLAGS)
-libgstacmmp3dec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-	-lgstriff-$(GST_MAJORMINOR) -lmsacm32
-libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
-
+plugin_LTLIBRARIES = libgstacmmp3dec.la
+
+libgstacmmp3dec_la_SOURCES = acmmp3dec.c
+libgstacmmp3dec_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) $(ACMMP3DEC_CFLAGS)
+libgstacmmp3dec_la_LIBADD =      \
+    $(GST_BASE_LIBS)             \
+    $(GST_PLUGINS_BASE_LIBS)     \
+    -lgstriff-$(GST_MAJORMINOR)  \
+    -lgstaudio-$(GST_MAJORMINOR) \
+    -lgsttag-$(GST_MAJORMINOR)   \
+    -lmsacm32
+libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
+