diff --git a/CHANGELOG b/CHANGELOG
index eb15d8b71..f122fd39e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ Release 1.5.2 (2013-03-??)
 - automatic library initialization macros
 - fixed GH #110: WebSocket accept() fails when Connection header contains multiple tokens
 - fixed GH# 71: WebSocket and broken Timeouts (POCO_BROKEN_TIMEOUTS)
+- fixed a warning in Poco/Crypto/OpenSSLInitializer.h
 
 Release 1.5.1 (2013-01-11)
 ==========================
diff --git a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
index 4f36cbdb1..0ca331699 100644
--- a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
+++ b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
@@ -118,14 +118,16 @@ inline bool OpenSSLInitializer::isFIPSEnabled()
 #endif
 }
 
-
+#ifdef OPENSSL_FIPS
 inline void OpenSSLInitializer::enableFIPSMode(bool enabled)
 {
-#ifdef OPENSSL_FIPS
 	FIPS_mode_set(enabled);
-#endif
 }
-
+#else
+inline void OpenSSLInitializer::enableFIPSMode(bool /*enabled*/)
+{
+}
+#endif
 
 } } // namespace Poco::Crypto