diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index d3de49b23..62b25aa71 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -146,5 +146,6 @@ BarrelHazard=3
 DualPlatformBarrelHazard=11
 BouncingBarrel=12
 Fireball=13
+BouncingRock=12
 
 
diff --git a/tools/MapEdit/Hazard.ini b/tools/MapEdit/Hazard.ini
index 5201da4c1..eb4e52154 100644
--- a/tools/MapEdit/Hazard.ini
+++ b/tools/MapEdit/Hazard.ini
@@ -179,3 +179,13 @@ Collision=0
 Health=0
 AttackStrength=0
 Respawn=2
+
+[BouncingRock]
+Gfx=..\..\graphics\hazards\RollingRock\RollingRock.gin
+WayPoints=32
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=2