diff --git a/src/reference/asciidoc/amqp.adoc b/src/reference/asciidoc/amqp.adoc
index 69539378d0..4f16276552 100644
--- a/src/reference/asciidoc/amqp.adoc
+++ b/src/reference/asciidoc/amqp.adoc
@@ -472,6 +472,10 @@ Starting with Spring AMQP _version 1.5_, these properties can be set directly on
 If both discrete properties and `sslPropertiesLocation` is provided, properties in the latter will override the
 discrete values.
 
+IMPORTANT: Starting with version 2.0, the server certificate is validated by default because it is more secure.
+If you wish to skip this validation for some reason, set the factory bean's `skipServerCertificateValidation` property to `true`.
+Starting with version 2.1, the `RabbitConnectionFactoryBean` now calls `enableHostnameVerification()` by default; to revert to the previous behavior, set the `enableHostnameVerification` property to `false`.
+
 [[routing-connection-factory]]
 ===== Routing Connection Factory