diff --git a/makefile.gaz b/makefile.gaz
index cc6816ef0..28e1e3b94 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -138,7 +138,8 @@ hazard_src :=		hazard \
 					hbwheel \
 					hdbarrel \
 					hbbarrel \
-					hrrock
+					hrrock \
+					hflytrap
 
 fx_src :=			fx \
 					fxtrail \
diff --git a/source/hazard/hazard.cpp b/source/hazard/hazard.cpp
index e18e1ee6b..791445107 100644
--- a/source/hazard/hazard.cpp
+++ b/source/hazard/hazard.cpp
@@ -91,6 +91,10 @@
 #include "hazard\hrrock.h"
 #endif
 
+#ifndef __HAZARD_HFLYTRAP_H__
+#include "hazard\hflytrap.h"
+#endif
+
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -111,6 +115,7 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
 	NPC_BOUNCING_BARREL_HAZARD,
 	NPC_FIREBALL_HAZARD,
 	NPC_ROLLING_ROCK_HAZARD,
+	NPC_FLY_TRAP_HAZARD,
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -213,6 +218,12 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
 			break;
 		}
 
+		case NPC_FLY_TRAP_HAZARD:
+		{
+			hazard = new ("fly trap hazard") CNpcFlyTrapHazard;
+			break;
+		}
+
 		default:
 		{
 			hazard = NULL;
diff --git a/source/hazard/hazard.h b/source/hazard/hazard.h
index e6ef87673..87cad3ac5 100644
--- a/source/hazard/hazard.h
+++ b/source/hazard/hazard.h
@@ -51,6 +51,7 @@ public:
 		NPC_BOUNCING_BARREL_HAZARD,
 		NPC_FIREBALL_HAZARD,
 		NPC_ROLLING_ROCK_HAZARD,
+		NPC_FLY_TRAP_HAZARD,
 
 		NPC_HAZARD_TYPE_MAX,
 	};
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index ff9d2ac6e..ed12c3c8d 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -147,5 +147,6 @@ DualPlatformBarrelHazard=11
 BouncingBarrel=12
 Fireball=13
 BouncingRock=12
+FlyTrap=15
 
 
diff --git a/tools/MapEdit/Hazard.ini b/tools/MapEdit/Hazard.ini
index eb4e52154..aaa5cba41 100644
--- a/tools/MapEdit/Hazard.ini
+++ b/tools/MapEdit/Hazard.ini
@@ -189,3 +189,13 @@ Collision=0
 Health=0
 AttackStrength=0
 Respawn=2
+
+[FlyTrap]
+Gfx=..\..\graphics\hazards\FlyTrap\FlyTrap.gin
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=2
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 26496c137..2cacf1e56 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -885,6 +885,14 @@ SOURCE=..\..\..\source\hazard\hfirebal.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\hazard\hflytrap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\hazard\hflytrap.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\hazard\hmasher.cpp
 # End Source File
 # Begin Source File