diff --git a/src/server/scihunt/server.c b/src/server/scihunt/server.c
index d3aa5889..c6950051 100644
--- a/src/server/scihunt/server.c
+++ b/src/server/scihunt/server.c
@@ -24,7 +24,8 @@ void Game_Worldspawn(void)
 {
 	precache_model("models/player.mdl");
 	precache_model("models/w_weaponbox.mdl");
-	precache_sound("fvox/flatline.wav");
+	Sound_Precache("player.die");
+	Sound_Precache("player.fall");
 
 	Player_Precache();
 	Weapons_Init();
diff --git a/src/server/tfc/server.c b/src/server/tfc/server.c
index 6f1d6ff7..3a256ecc 100644
--- a/src/server/tfc/server.c
+++ b/src/server/tfc/server.c
@@ -25,9 +25,10 @@ Game_Worldspawn(void)
 {
 	Sound_Precache("ammo.pickup");
 	Sound_Precache("ammo.respawn");
+	Sound_Precache("player.die");
+	Sound_Precache("player.fall");
 	precache_model("models/player.mdl");
 	precache_model("models/w_weaponbox.mdl");
-	precache_sound("fvox/flatline.wav");
 	Weapons_Init();
 	Player_Precache();
 }
diff --git a/src/server/valve/gamerules_multiplayer.cpp b/src/server/valve/gamerules_multiplayer.cpp
index 8c454572..f393bb8a 100644
--- a/src/server/valve/gamerules_multiplayer.cpp
+++ b/src/server/valve/gamerules_multiplayer.cpp
@@ -67,7 +67,7 @@ HLMultiplayerRules::PlayerDeath(player pl)
 
 	pl.think = PutClientInServer;
 	pl.nextthink = time + 4.0f;
-	sound(pl, CHAN_AUTO, "fvox/flatline.wav", 1.0, ATTN_NORM);
+	Sound_Play(pl, CHAN_AUTO, "player.die");
 
 	if (pl.health < -50) {
 		pl.health = 0;
diff --git a/src/server/valve/gamerules_singleplayer.cpp b/src/server/valve/gamerules_singleplayer.cpp
index 88ae25c9..23bb0ace 100644
--- a/src/server/valve/gamerules_singleplayer.cpp
+++ b/src/server/valve/gamerules_singleplayer.cpp
@@ -22,7 +22,7 @@ HLSingleplayerRules::PlayerDeath(player pl)
 	pl.takedamage = DAMAGE_NO;
 	pl.flags &= ~FL_FLASHLIGHT;
 	pl.armor = pl.activeweapon = pl.g_items = 0;
-	sound(pl, CHAN_AUTO, "fvox/flatline.wav", 1.0, ATTN_NORM);
+	Sound_Play(pl, CHAN_AUTO, "player.die");
 
 	if (pl.health < -50) {
 		pl.health = 0;
diff --git a/src/server/valve/server.c b/src/server/valve/server.c
index ab3dc58d..a7b49fdf 100644
--- a/src/server/valve/server.c
+++ b/src/server/valve/server.c
@@ -17,7 +17,6 @@
 void
 Game_InitRules(void)
 {
-	print("Game_InitRules!\n");
 	if (cvar("sv_playerslots") == 1 || cvar("coop") == 1) {
 		g_grMode = spawn(HLSingleplayerRules);
 	} else {
@@ -30,9 +29,10 @@ Game_Worldspawn(void)
 {
 	Sound_Precache("ammo.pickup");
 	Sound_Precache("ammo.respawn");
+	Sound_Precache("player.die");
+	Sound_Precache("player.fall");
 	precache_model("models/player.mdl");
 	precache_model("models/w_weaponbox.mdl");
-	precache_sound("fvox/flatline.wav");
 	Weapons_Init();
 	Player_Precache();
 }
diff --git a/src/shared/valve/pmove.c b/src/shared/valve/pmove.c
index 2a1993a2..f717eb65 100644
--- a/src/shared/valve/pmove.c
+++ b/src/shared/valve/pmove.c
@@ -32,7 +32,7 @@ void GamePMove_Fall(player target, float impactspeed)
 #ifdef SERVER
 		float fFallDamage = (impactspeed - 580) * (100 / (1024 - 580));
 		Damage_Apply(self, world, fFallDamage, 0, DMG_FALL);
-		sound(self, CHAN_AUTO, "player/pl_fallpain3.wav", 1.0, ATTN_NORM);
+		Sound_Play(self, CHAN_AUTO, "player.fall");
 #endif
 	}
 }