diff --git a/CHANGELOG b/CHANGELOG
index 948bd7b04c..6be2737d2f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,6 +47,8 @@ NEW:
 		Added initial support for Tmp(TS) sprites.
 		Added GainsUnitUpgrades trait for leveling specific unit upgrades - firepower, armor, speed.
 		Added support for crates to level up specific unit upgrades.
+		Merged CrateDrop functionality into CrateSpawner.
+		Added support to CrateSpawner for spawning multiple types of crates.
 		Added a new Launch.Replay=$FILEPATH parameter for OpenRA.Game.exe to instantly start watching a *.rep file.
 		Added HackyAI settings: ExcessPowerFactor, MinimumExcessPower, IdleBaseUnitsMaximum, RushAttackScanRadius, ProtectUnitScanRadius, RallyPointScanRadius. See the traits documentation for more information.
 		Added HitAnimPalette trait for LaserZap projectiles. Laser hit animations can now specify individual palettes. Defaults to effect palette.
diff --git a/OpenRA.Utility/UpgradeRules.cs b/OpenRA.Utility/UpgradeRules.cs
index 67e49f088d..c6d8a06eb8 100644
--- a/OpenRA.Utility/UpgradeRules.cs
+++ b/OpenRA.Utility/UpgradeRules.cs
@@ -93,6 +93,19 @@ namespace OpenRA.Utility
 						ConvertPxToRange(ref node.Value.Value);
 				}
 
+				// CrateDrop was replaced with CrateSpawner
+				if (engineVersion < 20131231)
+				{
+					if (depth == 1 && parentKey == "World")
+					{
+						if (node.Key == "CrateDrop")
+							node.Key = "CrateSpawner";
+
+						if (node.Key == "-CrateDrop")
+							node.Key = "-CrateSpawner";
+					}
+				}
+
 				// AttackMove was generalized to support all moveable actor types
 				if (engineVersion < 20140116)
 				{