diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index f9ddb20aad..fbc8c51f94 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.3.71"
     const val appName = "Unciv"
-    const val appCodeNumber = 515
-    const val appVersion = "3.12.4"
+    const val appCodeNumber = 516
+    const val appVersion = "3.12.5"
 
     const val gdxVersion = "1.9.12"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index 5c1b3f71a3..38eb101a57 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,17 @@
+## 3.12.5
+
+Resolved #3470 - popups now make the rest of the screen unclickable to avoid exploits
+
+Resolved #3431 - Redesigned the player picker, to scroll through civs and display them separately
+
+Resolved #3476 - captured civilian units no longer move on the same turn
+
+Resolved #3331 - resources for city-state quests are taken from resources on the map
+
+Resolved #3464 - units only advance improvements when they have movement points left
+
+Fixed minor automation bug for modded terrains
+
 ## 3.12.4
 
 Resolved #3424 - Added blink on event location
diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
index ae0e570731..513ae1cc6a 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
@@ -277,9 +277,10 @@ object UnitActions {
 
         if (unit.isEmbarked()) return
 
-        val canConstruct = !tile.isCityCenter()
+        val canConstruct = unit.currentMovement > 0
+                && !tile.isCityCenter()
                 && unit.civInfo.gameInfo.ruleSet.tileImprovements.values
-                    .any { tile.canBuildImprovement(it, unit.civInfo) }
+                .any { tile.canBuildImprovement(it, unit.civInfo) }
         actionList += UnitAction(
                 type = UnitActionType.ConstructImprovement,
                 isCurrentAction = unit.currentTile.hasImprovementInProgress(),