diff --git a/configure.ac b/configure.ac
index cb714cb..04c4e00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ DBG_CFLAGS="-g -fstack-check -DDEBUG=1"
 RLS_CFLAGS="-DNDEBUG=1"
 APP_RESOURCES=""
 APP_LDFLAGS=""
-DLL_LDFLAGS="-shared"
+DLL_LDFLAGS="-shared -Wl,-soname,\$(@F)"
 STATIC_LDFLAGS=""
 
 dnl ---------------------------------------------------------------------------
@@ -79,8 +79,8 @@ case "$host" in
 		app_cv_osname="windows"
 		CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
 		LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
-		LDFLAGS="$LDFLAGS -pthread -static-libgcc -static-libstdc++"
-		DLL_LDFLAGS="-shared"
+		LDFLAGS="$LDFLAGS -pthread"
+		DLL_LDFLAGS="-shared -Wl,--output-def,\$@.def"
 		DLLEXT=".dll"
 
 		app_win32_revision=$(date +%y.%m.%d.%H)
@@ -119,6 +119,7 @@ AC_SUBST(LIBS)
 AC_SUBST(LOGDIR)
 AC_SUBST(DLLEXT)
 AC_SUBST(DLLPREFIX)
+AC_SUBST(DLL_LDFLAGS)
 
 dnl ---------------------------------------------------------------------------
 dnl Check host compiler
diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in
index 6374920..046c148 100644
--- a/src/lib3270/Makefile.in
+++ b/src/lib3270/Makefile.in
@@ -205,7 +205,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
 	@$(MKDIR) `dirname $@`
 	@echo $< ...
 	@$(LD) \
-		-shared -Wl,-soname,$(@F) \
+		@DLL_LDFLAGS@ \
 		-o $@ \
 		$(LDFLAGS) \
 		$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \
@@ -266,7 +266,7 @@ install-dev:
 
 	@$(INSTALL_DATA) \
 		../include/lib3270/*.h \
-		$(DESTDIR)$(includedir)/lib3270		
+		$(DESTDIR)$(includedir)/lib3270
 
 	@$(INSTALL_DATA) \
 		../include/lib3270.h \
--
libgit2 0.21.2