diff --git a/CHANGES b/CHANGES
index c5f893bd90..fb695d438e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+5582.	[bug]		BIND 9 failed to build when static OpenSSL libraries
+			were used and the *.pc files for libssl and/or libcrypto
+			were unavailable. This has been fixed by ensuring the
+			correct linking order for libssl and libcrypto is always
+			used. [GL #2402]
+
 5581.	[bug]		Fix memory leak happening when inline-signed zones
 			were added to the configuration followed by a
 			reconfiguration of named. [GL #2041]
diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4
index 19d0c2d176..a3faba0a45 100644
--- a/m4/ax_check_openssl.m4
+++ b/m4/ax_check_openssl.m4
@@ -68,7 +68,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
 	    AS_IF([test -f "$ssldir/include/openssl/ssl.h"],
 	        [
 		    OPENSSL_CFLAGS="-I$ssldir/include"
-                    OPENSSL_LIBS="-L$ssldir/lib -lcrypto -lssl"
+                    OPENSSL_LIBS="-L$ssldir/lib -lssl -lcrypto"
                     found=true
                     AC_MSG_RESULT([yes])
                     break