diff --git a/2.1.x/multi/multi__spring_cloud_config_server.html b/2.1.x/multi/multi__spring_cloud_config_server.html
index debc30f5..9100a0a1 100644
--- a/2.1.x/multi/multi__spring_cloud_config_server.html
+++ b/2.1.x/multi/multi__spring_cloud_config_server.html
@@ -468,7 +468,8 @@ In practice, you might not want to do decrypt locally, because it spreads the ke
 concentrating it in the server.
 On the other hand, it can be a useful option if your config server is relatively insecure and only a handful of clients need the encrypted properties.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="_creating_a_key_store_for_testing" href="#_creating_a_key_store_for_testing"></a>2.6&nbsp;Creating a Key Store for Testing</h2></div></div></div><p>To create a keystore for testing, you can use a command resembling the following:</p><pre class="screen">$ keytool -genkeypair -alias mytestkey -keyalg RSA \
   -dname "CN=Web Server,OU=Unit,O=Organization,L=City,S=State,C=US" \
-  -keypass changeme -keystore server.jks -storepass letmein</pre><p>Put the <code class="literal">server.jks</code> file in the classpath (for instance) and then, in
+  -keypass changeme -keystore server.jks -storepass letmein</pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="images/note.png"></td><th align="left">Note</th></tr><tr><td align="left" valign="top"><p>When using JDK 11 or above you may get the following warning when using the command above.  In this case
+you probably want to make sure the <code class="literal">keypass</code> and <code class="literal">storepass</code> values match.</p></td></tr></table></div><pre class="screen">Warning:  Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified -keypass value.</pre><p>Put the <code class="literal">server.jks</code> file in the classpath (for instance) and then, in
 your <code class="literal">bootstrap.yml</code>, for the Config Server, create the following settings:</p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">encrypt</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  keyStore</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    location</span>: classpath:/server.jks
diff --git a/2.1.x/single/spring-cloud-config.html b/2.1.x/single/spring-cloud-config.html
index dd50dd48..2c9f030f 100644
--- a/2.1.x/single/spring-cloud-config.html
+++ b/2.1.x/single/spring-cloud-config.html
@@ -552,7 +552,8 @@ In practice, you might not want to do decrypt locally, because it spreads the ke
 concentrating it in the server.
 On the other hand, it can be a useful option if your config server is relatively insecure and only a handful of clients need the encrypted properties.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="_creating_a_key_store_for_testing" href="#_creating_a_key_store_for_testing"></a>2.6&nbsp;Creating a Key Store for Testing</h2></div></div></div><p>To create a keystore for testing, you can use a command resembling the following:</p><pre class="screen">$ keytool -genkeypair -alias mytestkey -keyalg RSA \
   -dname "CN=Web Server,OU=Unit,O=Organization,L=City,S=State,C=US" \
-  -keypass changeme -keystore server.jks -storepass letmein</pre><p>Put the <code class="literal">server.jks</code> file in the classpath (for instance) and then, in
+  -keypass changeme -keystore server.jks -storepass letmein</pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="images/note.png"></td><th align="left">Note</th></tr><tr><td align="left" valign="top"><p>When using JDK 11 or above you may get the following warning when using the command above.  In this case
+you probably want to make sure the <code class="literal">keypass</code> and <code class="literal">storepass</code> values match.</p></td></tr></table></div><pre class="screen">Warning:  Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified -keypass value.</pre><p>Put the <code class="literal">server.jks</code> file in the classpath (for instance) and then, in
 your <code class="literal">bootstrap.yml</code>, for the Config Server, create the following settings:</p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">encrypt</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  keyStore</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    location</span>: classpath:/server.jks
diff --git a/2.1.x/spring-cloud-config.xml b/2.1.x/spring-cloud-config.xml
index 6a259de4..3d6be02c 100644
--- a/2.1.x/spring-cloud-config.xml
+++ b/2.1.x/spring-cloud-config.xml
@@ -1140,6 +1140,11 @@ On the other hand, it can be a useful option if your config server is relatively
 <screen>$ keytool -genkeypair -alias mytestkey -keyalg RSA \
   -dname "CN=Web Server,OU=Unit,O=Organization,L=City,S=State,C=US" \
   -keypass changeme -keystore server.jks -storepass letmein</screen>
+<note>
+<simpara>When using JDK 11 or above you may get the following warning when using the command above.  In this case
+you probably want to make sure the <literal>keypass</literal> and <literal>storepass</literal> values match.</simpara>
+</note>
+<screen>Warning:  Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified -keypass value.</screen>
 <simpara>Put the <literal>server.jks</literal> file in the classpath (for instance) and then, in
 your <literal>bootstrap.yml</literal>, for the Config Server, create the following settings:</simpara>
 <programlisting language="yaml" linenumbering="unnumbered">encrypt: