diff --git a/Makefile.am b/Makefile.am
index 76d4a70ba..bb0ded6ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,12 @@ noinst_LTLIBRARIES = libphp_mapi.la
 pkglibexec_PROGRAMS = cgkrepair delivery delivery-queue event gromox-snapshot http imap midb pop3 timer zcore
 pkglib_LTLIBRARIES = ${exchange_plugins} ${mta_plugins} ${mra_plugins} libmapi4zf.la
 default_sym = ${srcdir}/default.sym
+if WITH_GNU_LD
 default_SYFLAGS = -Wl,--version-script=${default_sym}
+endif
+if WITH_SUN_LD
+default_SYFLAGS = -Wl,-M,${default_sym}
+endif
 plugin_LDFLAGS = -avoid-version -module ${default_SYFLAGS${NO_VSYM}}
 pamlibdir = ${libdir}/security
 if HAVE_PAM
diff --git a/configure.ac b/configure.ac
index 7d397a0bd..89ee24de8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,9 @@ LT_INIT([disable-static])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AC_PROG_CXX
+AM_CONDITIONAL([WITH_GNU_LD], [test "$with_gnu_ld" = yes])
+AS_IF([test -n "$LD" && $LD -z help >/dev/null 2>/dev/null], [with_sun_ld=yes], [with_sun_ld=no])
+AM_CONDITIONAL([WITH_SUN_LD], [test "$with_sun_ld" = yes])
 
 saved_CPPFLAGS="$CPPFLAGS"
 saved_CFLAGS="$CFLAGS"
diff --git a/doc/install.rst b/doc/install.rst
index 352d5fc7a..10641a8a8 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -19,8 +19,8 @@ dependencies are needed:
 * libvmime >= 0.9.2+git160 (commit c6904bd7cf03f6cca92cf0d15aec02e7850e0276)
 * libxml2 (we use this for HTML parsing)
 * libzstd >= 1.4
-* MariaDB Connector/C or compatible
-* OpenLDAP or similar headers
+* MariaDB Connector/C or mariadb-client or compatible API
+* OpenLDAP
 * OpenSSL-compatible libssl
 * OpenSSL-compatible libcrypto
   (must have SHA-3 *if* libxxhash is not used)