diff --git a/makefile.gaz b/makefile.gaz
index 5c1142d80..f982837aa 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -147,7 +147,8 @@ hazard_src :=		hazard \
 					hflytrap \
 					hrweight \
 					hrwheel \
-					hpswitch
+					hpswitch \
+					hrckshrd
 
 fx_src :=			fx \
 					fxbaseanim \
diff --git a/source/hazard/hazard.cpp b/source/hazard/hazard.cpp
index 68971f72a..6dcd71ba7 100644
--- a/source/hazard/hazard.cpp
+++ b/source/hazard/hazard.cpp
@@ -107,6 +107,10 @@
 #include "hazard\hpswitch.h"
 #endif
 
+#ifndef __HAZARD_HRCKSHRD_H__
+#include "hazard\hrckshrd.h"
+#endif
+
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -131,6 +135,7 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
 	NPC_RISING_WEIGHT_HAZARD,
 	NPC_RISING_WEIGHT_WHEEL_HAZARD,
 	NPC_PRESSURE_SWITCH_HAZARD,
+	NPC_ROCKSHARD_HAZARD,
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -257,6 +262,12 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
 			break;
 		}
 
+		case NPC_ROCKSHARD_HAZARD:
+		{
+			hazard = new ("rock shard hazard") CNpcRockShardHazard;
+			break;
+		}
+
 		default:
 		{
 			hazard = NULL;
diff --git a/source/hazard/hazard.h b/source/hazard/hazard.h
index 1c79423cb..b836ac4e1 100644
--- a/source/hazard/hazard.h
+++ b/source/hazard/hazard.h
@@ -55,6 +55,7 @@ public:
 		NPC_RISING_WEIGHT_HAZARD,
 		NPC_RISING_WEIGHT_WHEEL_HAZARD,
 		NPC_PRESSURE_SWITCH_HAZARD,
+		NPC_ROCKSHARD_HAZARD,
 
 		NPC_HAZARD_TYPE_MAX,
 	};
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index dde756062..9cee92b0f 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -134,7 +134,7 @@ Ch1L1_Plat2=1
 ################################################
 # Hazards
 [Hazard]
-RockShard=0
+RockShard=19
 HeartPendulum=1
 Tugboat=2
 Acorn=0
@@ -155,4 +155,5 @@ BouncingRock=12
 FlyTrap=15
 RisingWeight=16
 RisingWeightWheel=17
-PressureSwitch=18
\ No newline at end of file
+PressureSwitch=18
+SingleSpike=19
\ No newline at end of file
diff --git a/tools/MapEdit/Hazard.ini b/tools/MapEdit/Hazard.ini
index 4523133d4..81417048b 100644
--- a/tools/MapEdit/Hazard.ini
+++ b/tools/MapEdit/Hazard.ini
@@ -229,3 +229,13 @@ Collision=0
 Health=0
 AttackStrength=0
 Respawn=2
+
+[SingleSpike]
+Gfx=..\..\graphics\hazards\rockshard_pc\pc_single_spike.gin
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=1
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index d2919b00e..094a8178e 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -929,6 +929,14 @@ SOURCE=..\..\..\source\hazard\hpswitch.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\hazard\hrckshrd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\hazard\hrckshrd.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\hazard\hrrock.cpp
 # End Source File
 # Begin Source File