diff --git a/activemq-core/src/main/resources/activemq.xsd b/activemq-core/src/main/resources/activemq.xsd
index f3f7c3b3df..7e6a0f8df5 100644
--- a/activemq-core/src/main/resources/activemq.xsd
+++ b/activemq-core/src/main/resources/activemq.xsd
@@ -4146,6 +4146,8 @@ should be used
       <xs:attribute name='maxProducersToAudit' type='xs:integer'/>
       <xs:attribute name='maxQueueAuditDepth' type='xs:integer'/>
       <xs:attribute name='memoryLimit' type='xs:string'/>
+      <xs:attribute name='expireMessagesPeriod' type='xs:long'/>
+      <xs:attribute name='maxExpirePageSize' type='xs:integer'/>
       <xs:attribute name='messageEvictionStrategy' type='xs:string'>
         <xs:annotation>
           <xs:documentation><![CDATA[
diff --git a/activemq-core/src/main/resources/activemq.xsd.html b/activemq-core/src/main/resources/activemq.xsd.html
index 56f9abfe46..790e77fadb 100644
--- a/activemq-core/src/main/resources/activemq.xsd.html
+++ b/activemq-core/src/main/resources/activemq.xsd.html
@@ -1305,6 +1305,8 @@ bridge</td></tr>
   <tr><td>maxProducersToAudit</td><td>xs:integer</td><td></td></tr>
   <tr><td>maxQueueAuditDepth</td><td>xs:integer</td><td></td></tr>
   <tr><td>memoryLimit</td><td>xs:long</td><td></td></tr>
+  <tr><td>expireMessagesPeriod</td><td>xs:long</td><td></td></tr>
+  <tr><td>maxExpirePageSize</td><td>xs:integer</td><td></td></tr>
   <tr><td>minimumMessageSize</td><td>xs:long</td><td></td></tr>
   <tr><td>optimizedDispatch</td><td>xs:boolean</td><td></td></tr>
   <tr><td>producerFlowControl</td><td>xs:boolean</td><td></td></tr>
diff --git a/activemq-core/src/main/resources/activemq.xsd.wiki b/activemq-core/src/main/resources/activemq.xsd.wiki
index d34f99d838..0d1bd57a26 100644
--- a/activemq-core/src/main/resources/activemq.xsd.wiki
+++ b/activemq-core/src/main/resources/activemq.xsd.wiki
@@ -1615,6 +1615,8 @@ should be used{html} |
     | maxProducersToAudit | _int_ | {html}{html} |
     | maxQueueAuditDepth | _int_ | {html}{html} |
     | memoryLimit | _long_ | {html}{html} |
+    | expireMessagesPeriod | _long_ | {html}{html} |
+    | maxExpirePageSize | _int_ | {html}{html} |
     | messageEvictionStrategy | _[org.apache.activemq.broker.region.policy.MessageEvictionStrategy|#org.apache.activemq.broker.region.policy.MessageEvictionStrategy-types]_ | {html}Sets the eviction strategy used to decide which message to evict when the
 slow consumer needs to discard messages{html} |
     | messageGroupMapFactory | _[org.apache.activemq.broker.region.group.MessageGroupMapFactory|#org.apache.activemq.broker.region.group.MessageGroupMapFactory-types]_ | {html}Sets the factory used to create new instances of {MessageGroupMap} used