diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index 2bb904592..7aab736ab 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -205,6 +205,7 @@ ConveyorSwitch=21
 ExitMarker=20
 Swordfish=23
 Log=24
+KandyMachine=20
 
 
 ################################################
diff --git a/tools/MapEdit/Hazard.ini b/tools/MapEdit/Hazard.ini
index 87eeb9aea..023630beb 100644
--- a/tools/MapEdit/Hazard.ini
+++ b/tools/MapEdit/Hazard.ini
@@ -299,3 +299,13 @@ Collision=0
 Health=0
 AttackStrength=0
 Respawn=1
+
+[KandyMachine]
+Gfx=..\..\graphics\hazards\kandymachine\kandymachine.gin
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=1