diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25ef589e..f37c238f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## ??? (Not Release Yet)
+## 6.4.0-alpha.1
 
 ### New Features
 
@@ -10,10 +10,8 @@
   * If both local and remote instance have configured external XMPP connections, it will use legacy S2S connection.
 
 TODO: documentation, and settings names/descriptions changes related to direct XMPP S2S connections.
-TODO: write the new prosody modules README.
-TODO: mod_s2s_peertubelivechat: dont allow to connect to remote server that are not Peertube servers.
+TODO?: mod_s2s_peertubelivechat: dont allow to connect to remote server that are not Peertube servers?
 TODO: when sanitizing remote chat endpoint, check that the domain is the same as the video domain (or is room.videodomain.tld).
-TODO: get remote server chat informations if missing (for now, it can be missing if there is no known remote video from that server).
 TODO: outgoing s2s connection have a session.secure=true hardcoded. Should not.
 TODO: only compatible with Prosody 0.12.x. So it should be documented for people using «system Prosody». And i should fix the ARM AppImage.
 
diff --git a/package-lock.json b/package-lock.json
index 7dae2ac5..daf0c5b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "peertube-plugin-livechat",
-  "version": "6.3.0",
+  "version": "6.4.0-alpha.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "peertube-plugin-livechat",
-      "version": "6.3.0",
+      "version": "6.4.0-alpha.1",
       "license": "AGPL-3.0",
       "dependencies": {
         "async": "^3.2.2",
diff --git a/package.json b/package.json
index a4d16f75..dddc5e25 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube-plugin-livechat",
   "description": "PeerTube plugin livechat: offers a way to embed a chat system into Peertube.",
-  "version": "6.3.0",
+  "version": "6.4.0-alpha.1",
   "license": "AGPL-3.0",
   "author": {
     "name": "John Livingston",