diff --git a/configure b/configure
index f9a61bb..9f1b52f 100755
--- a/configure
+++ b/configure
@@ -4480,6 +4480,7 @@ $as_echo "#define ENABLE_BUNDLED_MD5 1" >>confdefs.h
 
 else
 	LDFLAGS_EXTRA="-lcrypto $LDFLAGS_EXTRA"
+	LDFLAGS_EXTRA_MOD_IPV6CALC="-lcrypto $LDFLAGS_EXTRA_MOD_IPV6CALC"
 	LDFLAGS_EXTRA_STATIC="-lcrypto -lz -ldl $LDFLAGS_EXTRA_STATIC"
 fi
 
@@ -6189,7 +6190,8 @@ fi
 
 
 
-	LDFLAGS_EXTRA="$LDFLAGS_EXTRA -ldb"
+	LDFLAGS_EXTRA="-ldb $LDFLAGS_EXTRA"
+	LDFLAGS_EXTRA_MOD_IPV6CALC="-ldb $LDFLAGS_EXTRA_MOD_IPV6CALC"
 
 $as_echo "#define HAVE_BERKELEY_DB_SUPPORT 1" >>confdefs.h
 
diff --git a/configure.in b/configure.in
index e54ca0d..7492237 100644
--- a/configure.in
+++ b/configure.in
@@ -245,6 +245,7 @@ if test "$ENABLE_BUNDLED_MD5" = "1"; then
 	AC_DEFINE(ENABLE_BUNDLED_MD5, 1, Define if bundled MD5 should be used)
 else
 	LDFLAGS_EXTRA="-lcrypto $LDFLAGS_EXTRA"
+	LDFLAGS_EXTRA_MOD_IPV6CALC="-lcrypto $LDFLAGS_EXTRA_MOD_IPV6CALC"
 	LDFLAGS_EXTRA_STATIC="-lcrypto -lz -ldl $LDFLAGS_EXTRA_STATIC"
 fi
 
@@ -1151,7 +1152,8 @@ if test "$require_libdb" = "yes"; then
 		AC_MSG_ERROR([Berkeley DB library header files not found (perhaps missing db4-devel/libdb-devel package)])
 	])
 
-	LDFLAGS_EXTRA="$LDFLAGS_EXTRA -ldb"
+	LDFLAGS_EXTRA="-ldb $LDFLAGS_EXTRA"
+	LDFLAGS_EXTRA_MOD_IPV6CALC="-ldb $LDFLAGS_EXTRA_MOD_IPV6CALC"
 	AC_DEFINE(HAVE_BERKELEY_DB_SUPPORT, 1, Define if Berkeley DB support is required.)
 fi