diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index aea3a294cf..5c258a9886 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,8 +4,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.8.21"
     const val appName = "Unciv"
-    const val appCodeNumber = 927
-    const val appVersion = "4.8.17"
+    const val appCodeNumber = 928
+    const val appVersion = "4.8.18"
 
     const val gdxVersion = "1.12.1"
     const val ktorVersion = "2.2.3"
diff --git a/changelog.md b/changelog.md
index 9bb8b0894d..767ed7346b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,26 @@
+## 4.8.18
+
+typo fix for enhanced religion city filter
+
+Added Human and AI filters, separated civFilter from nationFilter 
+
+By SomeTroglodyte:
+- Patch for on-screen keyboard hiding pedia search results 
+- CrashScreen info improved, allow easier testing of CrashScreen 
+- Fix "hidden from users" where Nation describes its unique Building (if it replaces an existing one) 
+- Rivers... Moddable Stats and Civilopedia 
+- (UX, QOL) World screen top stats row scales down to squeeze into available width 
+- Allow the "Civ destroyed" Notification to show a location 
+- Whitespace linting for opening curly braces and inheritance colon 
+- Fix Mod download issue - github url and indicator refresh 
+- Mix of issue fixes around diplomacy and trade 
+
+By tuvus:
+- Fixed land/sea nukes trying to act like air units 
+- Fixed promise not to settle 
+
+Fix Multiplayer spectator ids not logging  - By SeventhM
+
 ## 4.8.17
 
 modding: Negative tile damage cannot heal more than max health
diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt
index 7bd29fb460..800317d639 100644
--- a/core/src/com/unciv/UncivGame.kt
+++ b/core/src/com/unciv/UncivGame.kt
@@ -544,7 +544,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
 
     companion object {
         //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
-        val VERSION = Version("4.8.17", 927)
+        val VERSION = Version("4.8.18", 928)
         //endregion
 
         lateinit var Current: UncivGame
diff --git a/fastlane/metadata/android/en-US/changelogs/928.txt b/fastlane/metadata/android/en-US/changelogs/928.txt
new file mode 100644
index 0000000000..7f2b8204c9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/928.txt
@@ -0,0 +1,22 @@
+
+
+typo fix for enhanced religion city filter
+
+Added Human and AI filters, separated civFilter from nationFilter 
+
+By SomeTroglodyte:
+- Patch for on-screen keyboard hiding pedia search results 
+- CrashScreen info improved, allow easier testing of CrashScreen 
+- Fix "hidden from users" where Nation describes its unique Building (if it replaces an existing one) 
+- Rivers... Moddable Stats and Civilopedia 
+- (UX, QOL) World screen top stats row scales down to squeeze into available width 
+- Allow the "Civ destroyed" Notification to show a location 
+- Whitespace linting for opening curly braces and inheritance colon 
+- Fix Mod download issue - github url and indicator refresh 
+- Mix of issue fixes around diplomacy and trade 
+
+By tuvus:
+- Fixed land/sea nukes trying to act like air units 
+- Fixed promise not to settle 
+
+Fix Multiplayer spectator ids not logging  - By SeventhM
\ No newline at end of file