diff --git a/configure.ac b/configure.ac
index 879045e56cd9..ccfcb348c26e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10891,11 +10891,6 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
         BUILD_TYPE="$BUILD_TYPE MARIADB_CONNECTOR_C"
     fi
 
-    save_LIBS=$LIBS
-    AC_SEARCH_LIBS([crypt], [crypt xcrypt], [CRYPT_LIBS="$LIBS"], [CRYPT_LIBS=""])
-    LIBS=$save_LIBS
-    AC_SUBST([CRYPT_LIBS])
-
     AC_SUBST(SYSTEM_MARIADB_CONNECTOR_C)
     AC_SUBST(MARIADB_CFLAGS)
     AC_SUBST(MARIADB_LIBS)
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index f6844ecf7550..01607b4f44d7 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\
 $(eval $(call gb_Library_add_libs,mysqlc,\
 	$(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \
 	$(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),\
-	-lz -lm,-rdynamic -lz $(CRYPT_LIBS) -lm)) \
+	-lz -lm,-rdynamic -lz -lm)) \
 	$(if $(filter LINUX,$(OS)),-ldl,) \
 ))