Index: build-aux/m4/buildsys.m4
==================================================================
--- build-aux/m4/buildsys.m4
+++ build-aux/m4/buildsys.m4
@@ -198,14 +198,14 @@
 		CLEAN_LIB=''
 		;;
 	*-*-mingw* | *-*-cygwin*)
 		AC_MSG_RESULT(MinGW / Cygwin)
 		LIB_CFLAGS=''
-		LIB_LDFLAGS='-shared -Wl,--export-all-symbols,--out-implib,lib$$out.a'
+		LIB_LDFLAGS='-shared -Wl,--export-all-symbols,--out-implib,lib$${out%${LIB_SUFFIX}}.a'
 		LIB_LDFLAGS_INSTALL_NAME=''
 		LIB_PREFIX=''
-		LIB_SUFFIX='.dll'
+		LIB_SUFFIX='${LIB_MAJOR}.dll'
 		LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
 		PLUGIN_CFLAGS=''
 		PLUGIN_LDFLAGS='-shared'
 		PLUGIN_SUFFIX='.dll'
 		LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'