diff --git a/CHANGELOG.md b/CHANGELOG.md
index d67bd4c6..4c2448ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 3.6.4 - 2023-02-11
 
 ### Changed
 - When Neo block queries have a single `ownerId`, `siteId` and either a single `fieldId` or `id` set, the appropriate `structureId` will now also be set on the query, if it exists and wasn't already set on the query
diff --git a/composer.json b/composer.json
index 75ba1758..f977d8d2 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "spicyweb/craft-neo",
   "description": "A Matrix-like field type that uses existing fields",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "type": "craft-plugin",
   "keywords": [
     "cms",
@@ -21,7 +21,7 @@
   "support": {
     "issues": "https://github.com/spicywebau/craft-neo/issues",
     "source": "https://github.com/spicywebau/craft-neo",
-    "docs": "https://github.com/spicywebau/craft-neo/blob/3.6.3/README.md",
+    "docs": "https://github.com/spicywebau/craft-neo/blob/3.6.4/README.md",
     "rss": "https://github.com/spicywebau/craft-neo/commits/3.x.atom"
   },
   "require": {
@@ -44,7 +44,7 @@
     "schemaVersion": "3.6.2",
     "class": "benf\\neo\\Plugin",
     "changelogUrl": "https://github.com/spicywebau/craft-neo/blob/3.x/CHANGELOG.md",
-    "downloadUrl": "https://github.com/spicywebau/craft-neo/archive/refs/tags/3.6.3.zip"
+    "downloadUrl": "https://github.com/spicywebau/craft-neo/archive/refs/tags/3.6.4.zip"
   },
   "config": {
     "allow-plugins": {
diff --git a/package.json b/package.json
index c0540e6e..6dbf1a99 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "craft-neo",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "description": "A Matrix-like field type that uses existing fields",
   "main": "webpack.config.js",
   "scripts": {