diff --git a/_config.yml b/_config.yml
index 0f31b71..e84ca42 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,17 +11,17 @@
   toc_levels: 1..3
 
 # Simplifies introducing changes related to the latest release
-current_version: 6.3.0.2
-current_version_short: 6302
+current_version: 6.4.0
+current_version_short: 640
 current_25x_version: 2.5.33
-prev_version: 6.3.0.1
-prev_version_short: 6301
+prev_version: 6.3.0.2
+prev_version_short: 6302
 prev_25_version: 2.5.33
-release_date: 7 December 2023
-prev_release_date: 13 September 2023
+release_date: 19 April 2024
+prev_release_date: 7 December 2023
 prev_25_release_date: 7 December 2023
-release_date_short: 20231207-1
-prev_release_date_short: 20230913-1
+release_date_short: 20240419
+prev_release_date_short: 20231207-1
 prev_25_release_date_short: 20231207-2
 
 beta_release_date_short: 20160126
diff --git a/source/announce-2024.md b/source/announce-2024.md
new file mode 100644
index 0000000..a2ea0e2
--- /dev/null
+++ b/source/announce-2024.md
@@ -0,0 +1,66 @@
+---
+layout: default
+title: Announcements 2024
+---
+
+# Announcements 2024
+{:.no_toc}
+
+* Will be replaced with the ToC, excluding a header
+{:toc}
+
+<p class="pull-right">
+  Skip to: <a href="announce-2023">Announcements - 2023</a>
+</p>
+
+#### 20 April 2024 - Apache Struts version 7.0.0-M6 {#a20240420}
+
+The Apache Struts group is pleased to announce that Apache Struts version 7.0.0-MS is available as a Test Build.
+
+The Apache Struts is an elegant, extensible framework for creating enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from building, to deploying,
+to maintaining applications over time.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+7.0.0-M6) to find more details about performed
+> bug fixes and improvements.
+
+**This is a test build not ready to be used in production environments!**
+
+The 7.x series of the Apache Struts framework has a minimum requirement of the following specification versions:
+JakartaEE Servlet API 6.0.0, JakartaEE JSP API 3.0, and Java 17.
+
+Should any issues arise with your use of any version of the Struts framework, please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+#### 19 April 2024 - Apache Struts version 6.4.0 General Availability {#a20240419}
+
+The Apache Struts group is pleased to announce that Apache Struts version 6.4.0 is available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+The Apache Struts is an elegant, extensible framework for creating enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from building, to deploying,
+to maintaining applications over time.
+
+This version contains a lot of proactive security improvements, which should make your application hard to compromise. 
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+6.4.0) to find more details about performed
+> bug fixes and improvements.
+
+**All developers are strongly advised to perform this upgrade.**
+
+The 6.x series of the Apache Struts framework has a minimum requirement of the following specification versions:
+Servlet API 3.1, JSP API 2.1, and Java 8.
+
+Should any issues arise with your use of any version of the Struts framework, please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+You can download this version from our [download](download.cgi#struts-ga) page.
+
+<p class="pull-right">
+  Skip to: <a href="announce-2023">Announcements - 2023</a>
+</p>
+
+<p class="pull-left">
+  <strong>Next:</strong>
+  <a href="kickstart">Kickstart FAQ</a>
+</p>
diff --git a/source/download.html b/source/download.html
index 7e7e0e5..794e893 100644
--- a/source/download.html
+++ b/source/download.html
@@ -75,9 +75,10 @@
   <li>Full Distribution:
     <ul>
       <li>
-        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-all.zip">struts-{{ site.current_version }}-all.zip</a> (73MB)
+        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-all.zip">struts-{{ site.current_version }}-all.zip</a> (70MB)
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-all.zip.asc">PGP</a>]
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-all.zip.sha256">SHA256</a>]
+        [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-all.zip.sha512">SHA512</a>]
       </li>
     </ul>
   </li>
@@ -85,9 +86,10 @@
   <li>Example Applications:
     <ul>
       <li>
-        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-apps.zip">struts-{{ site.current_version }}-apps.zip</a> (32MB)
+        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-apps.zip">struts-{{ site.current_version }}-apps.zip</a> (35MB)
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-apps.zip.asc">PGP</a>]
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-apps.zip.sha256">SHA256</a>]
+        [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-apps.zip.sha512">SHA512</a>]
       </li>
     </ul>
   </li>
@@ -95,9 +97,10 @@
   <li>Essential Dependencies Only:
     <ul>
       <li>
-        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-min-lib.zip">struts-{{ site.current_version }}-min-lib.zip</a> (4MB)
+        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-min-lib.zip">struts-{{ site.current_version }}-min-lib.zip</a> (5.9MB)
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-min-lib.zip.asc">PGP</a>]
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-min-lib.zip.sha256">SHA256</a>]
+        [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-min-lib.zip.sha512">SHA512</a>]
       </li>
     </ul>
   </li>
@@ -105,9 +108,10 @@
   <li>All Dependencies:
     <ul>
       <li>
-        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-lib.zip">struts-{{ site.current_version }}-lib.zip</a> (24MB)
+        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-lib.zip">struts-{{ site.current_version }}-lib.zip</a> (25.5MB)
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-lib.zip.asc">PGP</a>]
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-lib.zip.sha256">SHA256</a>]
+        [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-lib.zip.sha512">SHA512</a>]
       </li>
     </ul>
   </li>
@@ -115,9 +119,10 @@
   <li>Documentation:
     <ul>
       <li>
-        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-docs.zip">struts-{{ site.current_version }}-docs.zip</a> (12MB)
+        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-docs.zip">struts-{{ site.current_version }}-docs.zip</a> (2.5MB)
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-docs.zip.asc">PGP</a>]
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-docs.zip.sha256">SHA256</a>]
+        [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-docs.zip.sha512">SHA512</a>]
       </li>
     </ul>
   </li>
@@ -125,9 +130,10 @@
   <li>Source:
     <ul>
       <li>
-        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-src.zip">struts-{{ site.current_version }}-src.zip</a> (6MB)
+        <a href="[preferred]struts/{{ site.current_version }}/struts-{{ site.current_version }}-src.zip">struts-{{ site.current_version }}-src.zip</a> (6.8MB)
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-src.zip.asc">PGP</a>]
         [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-src.zip.sha256">SHA256</a>]
+        [<a href="https://downloads.apache.org/struts/{{ site.current_version }}/struts-{{ site.current_version }}-src.zip.sha512">SHA512</a>]
       </li>
     </ul>
   </li>
diff --git a/source/index.html b/source/index.html
index f9d932c..0427160 100644
--- a/source/index.html
+++ b/source/index.html
@@ -27,7 +27,7 @@
         <p>
           Apache Struts {{ site.current_version }} GA has been released<br/>on {{ site.release_date }}.
         </p>
-        Read more in <a href="announce-2023#a{{ site.release_date_short }}">Announcement</a> or in
+        Read more in <a href="announce-2024#a{{ site.release_date_short }}">Announcement</a> or in
         <a href="{{ site.wiki_url }}/Version+Notes+{{ site.current_version }}">Version notes</a>
       </div>
       <div class="column col-md-4">
@@ -49,12 +49,12 @@
     </div>
     <div class="row">
       <div class="column col-md-4">
-        <h2>Apache Struts 6.3.0 GA</h2>
+        <h2>Apache Struts 7.0.0-M6</h2>
         <p>
-          Apache Struts 6.3.0 GA has been released<br/>on 4 September 2023.
+          Apache Struts 7.0.0-M6 test build is available as from 20 April 2024.
         </p>
-        Read more in <a href="announce-2023#a20230904">Announcement</a> or in
-        <a href="{{ site.wiki_url }}/Version+Notes+6.3.0">Version notes</a>
+        Read more in <a href="announce-2024#a20240420">Announcement</a> or in
+        <a href="{{ site.wiki_url }}/Version+Notes+7.0.0-M6">Version notes</a>
       </div>
       <div class="column col-md-4">
         <h2>Google's Patch Reward program</h2>
diff --git a/source/releases.html b/source/releases.html
index 67c0206..1976b43 100644
--- a/source/releases.html
+++ b/source/releases.html
@@ -102,10 +102,34 @@
   <tbody>
   <tr>
     <td class="no-wrap">
+      Struts 6.3.0.2
+    </td>
+    <td class="no-wrap">7 December 2023</td>
+    <td>
+    </td>
+    <td>
+      <a href="{{ site.wiki_url }}/Version+Notes+6.3.0.2">Version notes</a>
+    </td>
+  </tr>
+  <tr>
+    <td class="no-wrap">
+      Struts 6.3.0.1
+    </td>
+    <td class="no-wrap">13 September 2023</td>
+    <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>
+    </td>
+    <td>
+      <a href="{{ site.wiki_url }}/Version+Notes+6.3.0.1">Version notes</a>
+    </td>
+  </tr>
+  <tr>
+    <td class="no-wrap">
       Struts 6.3.0
     </td>
     <td class="no-wrap">4 September 2023</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
       <a href="{{ site.wiki_url }}/S2-065">S2-065</a>
     </td>
     <td>
@@ -118,6 +142,7 @@
     </td>
     <td class="no-wrap">10 July 2023</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
       <a href="{{ site.wiki_url }}/S2-065">S2-065</a>
     </td>
     <td>
@@ -130,6 +155,7 @@
     </td>
     <td class="no-wrap">13 June 2023</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
       <a href="{{ site.wiki_url }}/S2-065">S2-065</a>
     </td>
     <td>
@@ -142,6 +168,7 @@
     </td>
     <td class="no-wrap">13 June 2023</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
       <a href="{{ site.wiki_url }}/S2-065">S2-065</a>
     </td>
     <td>
@@ -154,6 +181,8 @@
     </td>
     <td class="no-wrap">10 March 2023</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
+      <a href="{{ site.wiki_url }}/S2-065">S2-065</a>,
       <a href="{{ site.wiki_url }}/S2-064">S2-064</a>,
       <a href="{{ site.wiki_url }}/S2-063">S2-063</a>
     </td>
@@ -167,6 +196,8 @@
     </td>
     <td class="no-wrap">28 November 2022</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
+      <a href="{{ site.wiki_url }}/S2-065">S2-065</a>,
       <a href="{{ site.wiki_url }}/S2-064">S2-064</a>,
       <a href="{{ site.wiki_url }}/S2-063">S2-063</a>
     </td>
@@ -180,6 +211,8 @@
     </td>
     <td class="no-wrap">15 September 2022</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
+      <a href="{{ site.wiki_url }}/S2-065">S2-065</a>,
       <a href="{{ site.wiki_url }}/S2-064">S2-064</a>,
       <a href="{{ site.wiki_url }}/S2-063">S2-063</a>
     </td>
@@ -193,6 +226,8 @@
     </td>
     <td class="no-wrap">6 June 2022</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
+      <a href="{{ site.wiki_url }}/S2-065">S2-065</a>,
       <a href="{{ site.wiki_url }}/S2-064">S2-064</a>,
       <a href="{{ site.wiki_url }}/S2-063">S2-063</a>
     </td>
@@ -206,6 +241,8 @@
     </td>
     <td class="no-wrap">4 April 2022</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
+      <a href="{{ site.wiki_url }}/S2-065">S2-065</a>,
       <a href="{{ site.wiki_url }}/S2-064">S2-064</a>,
       <a href="{{ site.wiki_url }}/S2-063">S2-063</a>
     </td>
@@ -219,6 +256,8 @@
     </td>
     <td class="no-wrap">22 January 2022</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
+      <a href="{{ site.wiki_url }}/S2-065">S2-065</a>,
       <a href="{{ site.wiki_url }}/S2-064">S2-064</a>,
       <a href="{{ site.wiki_url }}/S2-063">S2-063</a>
     </td>
@@ -232,6 +271,8 @@
     </td>
     <td class="no-wrap">02 January 2022</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
+      <a href="{{ site.wiki_url }}/S2-065">S2-065</a>,
       <a href="{{ site.wiki_url }}/S2-064">S2-064</a>,
       <a href="{{ site.wiki_url }}/S2-063">S2-063</a>
     </td>
@@ -245,6 +286,8 @@
     </td>
     <td class="no-wrap">23 December 2021</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
+      <a href="{{ site.wiki_url }}/S2-065">S2-065</a>,
       <a href="{{ site.wiki_url }}/S2-064">S2-064</a>,
       <a href="{{ site.wiki_url }}/S2-063">S2-063</a>
     </td>
@@ -258,6 +301,8 @@
     </td>
     <td class="no-wrap">17 December 2021</td>
     <td>
+      <a href="{{ site.wiki_url }}/S2-066">S2-066</a>,
+      <a href="{{ site.wiki_url }}/S2-065">S2-065</a>,
       <a href="{{ site.wiki_url }}/S2-064">S2-064</a>,
       <a href="{{ site.wiki_url }}/S2-063">S2-063</a>
     </td>