diff --git a/doc/Security.xml b/doc/Security.xml
index cfd8c6535..d3f2ca6fa 100644
--- a/doc/Security.xml
+++ b/doc/Security.xml
@@ -3438,6 +3438,8 @@
             shall not be assigned to the TLS server.</para>
           <para>If the certification path identified by the supplied certification path ID is
             already assigned to the TLS server, this command shall have no effect.</para>
+          <para>Note that the configuration may not be immediately active (see capability
+            SetupDuration).</para>
           <variablelist role="op">
             <varlistentry>
               <term>request</term>
@@ -3588,6 +3590,7 @@
               </listitem>
             </varlistentry>
           </variablelist>
+          <para>Note that the configuration change may not be immediately active (see capability SetupDuration).</para>
         </section>
         <section>
           <title>GetAssignedServerCertificates</title>
@@ -5061,6 +5064,10 @@
                     versions.</para>
                 </entry>
               </row>
+              <row>
+                <entry>SetupDuration</entry>
+                <entry><para>Indicates the maximum time taken for updated TLS server settings to take effect.</para></entry>
+              </row>
             </tbody>
           </tgroup>
         </table>
diff --git a/wsdl/ver10/advancedsecurity/wsdl/advancedsecurity.wsdl b/wsdl/ver10/advancedsecurity/wsdl/advancedsecurity.wsdl
index 163f9eb90..3c923cdcc 100644
--- a/wsdl/ver10/advancedsecurity/wsdl/advancedsecurity.wsdl
+++ b/wsdl/ver10/advancedsecurity/wsdl/advancedsecurity.wsdl
@@ -879,6 +879,11 @@
 						<xs:documentation>Indicates the maximum number of certification paths that may be assigned to the TLS server simultaneously.</xs:documentation>
 					</xs:annotation>
 				</xs:attribute>
+				<xs:attribute name="SetupDuration" type="xs:duration">
+					<xs:annotation>
+						<xs:documentation>Indicates the maximum time taken for updated TLS server settings to take effect.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
 				<!-- ========================================= -->
 				<!-- Begin cert-based client auth capabilities -->
 				<!-- ========================================= -->