diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1042c4880..15a526784 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 1.9.5
+
+### Compability changes
+
+* This version deprecates NodeJS16 as it reached its end of life and won't receive any updates. So to get started with Etherpad v1.9.5 you need NodeJS 18 and above.
+* The bundled windows NodeJS version has been bumped to the current LTS version 20.
+
+### Notable enhancements and fixes
+
+* The support for the tidy program to tidy up HTML files has been removed. This decision was made because it hasn't been updated for years and also caused an incompability when exporting a pad with Abiword. 
+
+
 # 1.9.4
 
 ### Compability changes
diff --git a/src/bin/buildForWindows.sh b/src/bin/buildForWindows.sh
index 6093e03b5..ef4512305 100755
--- a/src/bin/buildForWindows.sh
+++ b/src/bin/buildForWindows.sh
@@ -54,7 +54,7 @@ try rm -rf node_modules
 try mv node_modules_resolved node_modules
 
 log "download windows node..."
-try wget "https://nodejs.org/dist/latest-v16.x/win-x64/node.exe" -O node.exe
+try wget "https://nodejs.org/dist/latest-v20.x/win-x64/node.exe" -O node.exe
 
 log "create the zip..."
 try zip -9 -r "${OUTPUT}" ./*
diff --git a/src/bin/release.js b/src/bin/release.js
index b9c719beb..284b85ac3 100644
--- a/src/bin/release.js
+++ b/src/bin/release.js
@@ -160,6 +160,7 @@ try {
   run('git merge --no-ff --no-edit develop');
   console.log(`Creating ${newVersion} tag...`);
   run(`git tag -s '${newVersion}' -m '${newVersion}'`);
+  run(`git tag -s 'v${newVersion}' -m 'v${newVersion}'`);
   console.log('Switching back to develop...');
   run('git checkout develop');
   console.log('Merging master into develop...');