diff --git a/CHANGES b/CHANGES
index 67e91da..a2d1171 100644
--- a/CHANGES
+++ b/CHANGES
@@ -109,6 +109,10 @@ porting:
 	compilation does not fail on Cygwin (thanks to Peter Wagemans for
 	reporting this problem)
 
+	build failed on RHEL6 due to presence of fips.h; configure now checks
+	for fipsld too. Thanks to Andreas Gruenbacher for reporting this
+	problem
+
 ####################### V 2.0.0-b7:
 
 security:
diff --git a/configure.in b/configure.in
index f9f0206..abe5548 100644
--- a/configure.in
+++ b/configure.in
@@ -541,7 +541,9 @@ AC_ARG_ENABLE(fips, [  --disable-fips          disable OpenSSL FIPS support],
 
 if test -n "$WITH_FIPS"; then
   if test -n "$WITH_OPENSSL"; then
-    if test "$sc_cv_have_openssl_ssl_h" != "yes" -o "$sc_cv_have_libssl" != "yes"; then
+    AC_CHECK_PROG(HAVE_FIPSLD, fipsld, 1)
+    if test "$sc_cv_have_openssl_ssl_h" != "yes" -o "$sc_cv_have_libssl" != "yes" -o ! "$HAVE_FIPSLD";
+    then
       AC_MSG_WARN([not all components of OpenSSL found, disabling FIPS]);
       WITH_FIPS=
     fi