diff --git a/configure.ac b/configure.ac
index 2d11b7c4..cb31a242 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,9 +59,10 @@ AX_CHECK_COMPILE_FLAG([-fcatch-undefined-c99-behavior],
 AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"])
 AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], [CFLAGS="$CFLAGS -fno-strict-overflow"])
 
+LIBTOOL_EXTRA_FLAGS=-version-info $SODIUM_LIBRARY_VERSION
 case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    LIBTOOL_EXTRA_FLAGS=-module
+    LIBTOOL_EXTRA_FLAGS=-module -avoid-version
     AX_CHECK_LINK_FLAG([-Wl,--dynamicbase], [LDFLAGS="$LDFLAGS -Wl,--dynamicbase"])
     AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [LDFLAGS="$LDFLAGS -Wl,--nxcompat"])
     AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [
diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index 0d97029f..2ced073e 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -83,7 +83,6 @@ EXTRA_DIST = \
 libsodium_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-export-dynamic \
-	-version-info $(SODIUM_LIBRARY_VERSION) \
 	-no-undefined \
 	$(LIBTOOL_EXTRA_FLAGS)