diff --git a/_data/scala-releases.yml b/_data/scala-releases.yml
index af7f873e9..31ee6ab4c 100644
--- a/_data/scala-releases.yml
+++ b/_data/scala-releases.yml
@@ -1,7 +1,7 @@
 - category: current_version
   title: Current 3.6.x release
-  version: 3.6.3
-  release_date: January 20, 2025
+  version: 3.6.4
+  release_date: March 7, 2025
 - category: current_version
   title: Current 3.3.x LTS release
   version: 3.3.5
diff --git a/_downloads/2025-03-07-3.6.4.md b/_downloads/2025-03-07-3.6.4.md
new file mode 100644
index 000000000..a48382fe6
--- /dev/null
+++ b/_downloads/2025-03-07-3.6.4.md
@@ -0,0 +1,10 @@
+---
+title: Scala 3.6.4
+start: 7 March 2025
+layout: downloadpage
+release_version: 3.6.4
+release_date: "March 7, 2025"
+permalink: /download/3.6.4.html
+license: <a href="https://www.scala-lang.org/license/">Apache License, Version 2.0</a>
+api_docs: https://www.scala-lang.org/api/3.6.4/
+---
diff --git a/_posts/2025-03-07-release-notes-3.6.4.md b/_posts/2025-03-07-release-notes-3.6.4.md
new file mode 100644
index 000000000..e5f25bfe5
--- /dev/null
+++ b/_posts/2025-03-07-release-notes-3.6.4.md
@@ -0,0 +1,29 @@
+---
+category: announcement
+permalink: /news/3.6.4/
+title: "Scala 3.6.4 is now available!"
+---
+Scala 3.6.4 is now available!
+
+# Highlight of the release
+
+- Support for JDK 24 [#22250](https://github.com/scala/scala3/pull/22250)
+- REPL `:silent` command to toggle automatic printing of outputs [#22248](https://github.com/scala/scala3/pull/22248)
+- REPL `--repl-init-script:` setting to run a code on startup [#22206](https://github.com/scala/scala3/pull/22206)
+- Deprecated setting `-Xno-decode-stacktraces` is now an alias to `-Xno-enrich-error-messages` [#22208](https://github.com/scala/scala3/pull/22208)
+- Annotation arguments are no longer lifted [#22035](https://github.com/scala/scala3/pull/22035)
+- Experimental Capture Checking: Implement tracked members [#21761](https://github.com/scala/scala3/pull/21761)
+
+## Breaking changes
+
+- Align `@implicitNotFound` and `@implicitAmbigous` with the language specification [#22371](https://github.com/scala/scala3/pull/22371)
+
+  This change may impact users who previously used these annotations using variables or string interpolation.
+  
+  Previously, a bug in the Scala 3 compiler allowed non-literal strings to be passed as arguments to the `@implicitNotFound` and `@implicitAmbiguous` annotations.
+  This could have affected how failed implicit search results were reported by the compiler.
+  
+  Starting from Scala 3.6.4, the arguments for these annotations must be string literals.
+  If a message is too long, it can be concatenated using the `+` operator, allowing for constant folding.
+
+For a full list of changes and contributor credits, please refer to the [release notes](https://github.com/scala/scala3/releases/tag/3.6.4).