diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index b268e3296b..3a9811624e 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.4.30"
     const val appName = "Unciv"
-    const val appCodeNumber = 599
-    const val appVersion = "3.15.17"
+    const val appCodeNumber = 600
+    const val appVersion = "3.15.18"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index d3d82403f5..04c3344976 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,26 @@
+## 3.15.18
+
+600th version!
+
+Solved crash where city states would try to gift great people without cities
+
+By avdstaaij:
+- Fixed captured units not tp-ing out of illegal tiles 
+
+By SomeTroglodyte:
+- TranslationFileWriter support for CivilopediaText 
+- Fix Civilopedia Unique auto-linking when Ruleset changes 
+- Reduce atlas - The Huns was 4x larger than the other nations, and a dirty Hexagon dupe 
+- Better crude maps - zero uncovered tiles impossible 
+
+By xlenstra:
+- Added modoptions unique for disabling city-state spawning with only a settler 
+- Fixed bug where production from cutting down forests could apply to perpetual constructions 
+
+Improve River for FantasyHex  - By AdityaMH
+
+Fix Hagia Sophia and CN Tower not giving civ 5 bonuses  - By logicminimal
+
 ## 3.15.17
 
 Influence-by-game-progress works as intended