diff --git a/src/client/hud.qc b/src/client/hud.qc
index ba54373..f96e5bf 100644
--- a/src/client/hud.qc
+++ b/src/client/hud.qc
@@ -88,6 +88,7 @@ HUD_Init(void)
 	precache_model("sprites/640_logo.spr");
 	precache_model("sprites/640_suit.spr");
 	precache_model("sprites/640hud7.spr");
+	HUD_DamageNotify_Init();
 }
 
 /* handle single/multiple digits */
@@ -394,6 +395,7 @@ HUD_Draw(void)
 	}
 
 	HUD_DrawHealth();
+	HUD_DamageNotify_Draw();
 	HUD_DrawArmor();
 	HUD_DrawFlashlight();
 	HUD_DrawNotify();
diff --git a/src/client/progs.src b/src/client/progs.src
index b234eb1..3f9c13f 100644
--- a/src/client/progs.src
+++ b/src/client/progs.src
@@ -31,6 +31,7 @@ game_event.qc
 ../../../valve/src/client/viewmodel.qc
 ../../../valve/src/client/view.qc
 obituary.qc
+../../../valve/src/client/hud_dmgnotify.qc
 hud.qc
 ../../../valve/src/client/hud_weaponselect.qc
 ../../../valve/src/client/scoreboard.qc
diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc
index ac23132..1b168b8 100644
--- a/src/server/gamerules.qc
+++ b/src/server/gamerules.qc
@@ -63,18 +63,7 @@ HHDMultiplayerRules::PlayerDeath(base_player pl)
 
 	pl.health = 0;
 
-	/* Let's handle corpses on the clientside */
-	entity corpse = spawn();
-	setorigin(corpse, pl.origin + [0,0,32]);
-	setmodel(corpse, pl.model);
-	setsize(corpse, VEC_HULL_MIN, VEC_HULL_MAX);
-	corpse.movetype = MOVETYPE_TOSS;
-	corpse.solid = SOLID_TRIGGER;
-	corpse.modelindex = pl.modelindex;
-	corpse.frame = ANIM_DIESIMPLE;
-	corpse.angles = pl.angles;
-	corpse.velocity = pl.velocity;
-	corpse.colormap = pl.colormap;
+	FX_Corpse_Spawn(pl, ANIM_DIESIMPLE);
 }
 
 void
diff --git a/src/server/server.qc b/src/server/server.qc
index 976d07b..8270aa3 100644
--- a/src/server/server.qc
+++ b/src/server/server.qc
@@ -30,4 +30,5 @@ Game_Worldspawn(void)
 
 	Player_Precache();
 	Weapons_Init();
+	FX_Corpse_Init();
 }
diff --git a/src/shared/include.src b/src/shared/include.src
index 41c5757..a00ad75 100644
--- a/src/shared/include.src
+++ b/src/shared/include.src
@@ -15,6 +15,7 @@ pmove.qc
 ../../../valve/src/shared/fx_gibhuman.qc
 ../../../base/src/shared/fx_spark.qc
 ../../../valve/src/shared/fx_impact.qc
+../../../base/src/shared/fx_corpse.qc
 fx_lego.qc
 fx_legopiece.qc
 fx_soda.qc