diff --git a/Changelog.md b/Changelog.md
index 01d40e280..46e0d92a0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,11 @@ Changes are in reverse chronological order; newest changes at the top.
 * PNC:R 3.2.3 and later *require* Forge 40.1.20 or later
 * PNC:R 3.2.0 and later *require* Forge 40.1.0 or later and JEI 9.7.0 or later
 
+## 3.6.4
+
+### Fixed
+* Fixed hang on world unload with a lit kerosene lamp (backported fix from 1.19.2)
+
 ## 3.6.3
 
 ### Changed
diff --git a/gradle.properties b/gradle.properties
index 2555663be..3548c8c32 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ minecraft_version_range=[1.18.2,)
 mod_id=pneumaticcraft
 mod_version_massive=3
 mod_version_major=6
-mod_version_minor=3
+mod_version_minor=4
 curse_project_id=281849
 modrinth_project_id=ncAcdgk7
 
diff --git a/release_info.json b/release_info.json
index e8266965b..ae08906c6 100644
--- a/release_info.json
+++ b/release_info.json
@@ -1,8 +1,8 @@
 {
   "homepage": "https://minecraft.curseforge.com/projects/pneumaticcraft-repressurized",
   "promos": {
-    "1.18.2-recommended": "1.18.2-3.6.3",
-    "1.18.2-latest": "1.18.2-3.6.3"
+    "1.18.2-recommended": "1.18.2-3.6.4",
+    "1.18.2-latest": "1.18.2-3.6.4"
   },
   "1.18.2": {
     "1.18.2-3.1.0-56": "https://github.com/TeamPneumatic/pnc-repressurized/blob/1.18.2/Changelog.md#310-57-9-mar-2022",
@@ -27,6 +27,7 @@
     "1.18.2-3.6.0": "https://github.com/TeamPneumatic/pnc-repressurized/blob/1.18.2/Changelog.md#360",
     "1.18.2-3.6.1": "https://github.com/TeamPneumatic/pnc-repressurized/blob/1.18.2/Changelog.md#361",
     "1.18.2-3.6.2": "https://github.com/TeamPneumatic/pnc-repressurized/blob/1.18.2/Changelog.md#362",
-    "1.18.2-3.6.3": "https://github.com/TeamPneumatic/pnc-repressurized/blob/1.18.2/Changelog.md#363"
+    "1.18.2-3.6.3": "https://github.com/TeamPneumatic/pnc-repressurized/blob/1.18.2/Changelog.md#363",
+    "1.18.2-3.6.4": "https://github.com/TeamPneumatic/pnc-repressurized/blob/1.18.2/Changelog.md#364"
   }
 }