diff --git a/src/client/cstrike/entities.c b/src/client/cstrike/entities.c
index 5c4f4a57..bd3bbce4 100644
--- a/src/client/cstrike/entities.c
+++ b/src/client/cstrike/entities.c
@@ -18,6 +18,9 @@ int
 Game_Entity_Update(float id, float new)
 {
 	switch (id) {
+	case ENT_C4BOMB:
+		w_c4bomb_parse();
+		break;
 	default:
 		return FALSE;
 	}
diff --git a/src/client/cstrike/init.c b/src/client/cstrike/init.c
index 1f41dd15..955e8861 100644
--- a/src/client/cstrike/init.c
+++ b/src/client/cstrike/init.c
@@ -127,4 +127,6 @@ Game_RendererRestarted(string rstr)
 	FX_Spark_Init();
 	FX_Impact_Init();
 	FX_Smokenade_Init();
+	
+	g_c4bombled_spr = spriteframe("sprites/ledglow.spr", 0, 0.0f);
 }
diff --git a/src/server/cstrike/defs.h b/src/server/cstrike/defs.h
index a299b6d7..ea52c67b 100644
--- a/src/server/cstrike/defs.h
+++ b/src/server/cstrike/defs.h
@@ -17,7 +17,6 @@
 #include "gamerules.h"
 #include "money.h"
 #include "radio.h"
-#include "item_c4bomb.h"
 #include "../valve/items.h"
 
 var int g_cstrike_buying = 0;
diff --git a/src/server/cstrike/item_c4bomb.h b/src/server/cstrike/item_c4bomb.h
deleted file mode 100644
index 88bd4a50..00000000
--- a/src/server/cstrike/item_c4bomb.h
+++ /dev/null
@@ -1 +0,0 @@
-void C4Bomb_Plant(base_player); 
diff --git a/src/server/cstrike/progs.src b/src/server/cstrike/progs.src
index a3f60cc0..db0c31be 100755
--- a/src/server/cstrike/progs.src
+++ b/src/server/cstrike/progs.src
@@ -34,7 +34,6 @@
 ../cstrike/func_vip_safetyzone.cpp
 ../cstrike/info_map_parameters.cpp
 ../cstrike/item_suit.cpp
-../cstrike/item_c4bomb.cpp
 ../valve/items.cpp
 
 ../../botlib/include.src
diff --git a/src/shared/cstrike/include.src b/src/shared/cstrike/include.src
index 70d2fb14..2a15be67 100644
--- a/src/shared/cstrike/include.src
+++ b/src/shared/cstrike/include.src
@@ -5,6 +5,8 @@
 ../../shared/cstrike/animations.c
 ../../shared/cstrike/player.h
 
+../../shared/cstrike/item_c4bomb.h
+
 ../../shared/valve/fx_blood.c
 ../../shared/valve/fx_breakmodel.c
 ../../shared/valve/fx_explosion.c
@@ -47,4 +49,5 @@
 ../../shared/valve/weapon_common.c
 ../../shared/cstrike/pmove.c
 ../../shared/pmove.c
+../../shared/cstrike/item_c4bomb.cpp
 #endlist
diff --git a/src/server/cstrike/item_c4bomb.cpp b/src/shared/cstrike/item_c4bomb.cpp
similarity index 52%
rename from src/server/cstrike/item_c4bomb.cpp
rename to src/shared/cstrike/item_c4bomb.cpp
index 752f41d6..75ba2b23 100644
--- a/src/server/cstrike/item_c4bomb.cpp
+++ b/src/shared/cstrike/item_c4bomb.cpp
@@ -1,18 +1,62 @@
-/* C4 entity logic */
+/*
+ * Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
 
 class item_c4:CBaseEntity
 {
+#ifdef SERVER
 	entity m_eUser;
 	float m_flBeepTime;
 	float m_flExplodeTime;
 	float m_flDefusalState;
+#endif
 
+#ifdef CLIENT
+	float m_flAlpha;
+#endif
+
+#ifdef SERVER
 	void(void) item_c4;
+	virtual float(entity, float) SendEntity;
 	virtual void(void) ClearProgress;
 	virtual void(void) PlayerUse;
 	virtual void(void) Logic;
+#endif
+
+#ifdef CLIENT
+	void(void) item_c4;
+	virtual void(void) DrawLED;
+	virtual float(void) predraw;
+#endif
 };
 
+#ifdef SERVER
+float
+item_c4::SendEntity(entity pvsent, float flags)
+{
+	WriteByte(MSG_ENTITY, ENT_C4BOMB);
+	WriteCoord(MSG_ENTITY, origin[0]);
+	WriteCoord(MSG_ENTITY, origin[1]);
+	WriteCoord(MSG_ENTITY, origin[2]);
+	WriteCoord(MSG_ENTITY, angles[0]);
+	WriteCoord(MSG_ENTITY, angles[1]);
+	WriteCoord(MSG_ENTITY, angles[2]);
+	WriteShort(MSG_ENTITY, modelindex);
+	return TRUE;
+}
+
 void
 item_c4::ClearProgress(void)
 {
@@ -150,7 +194,90 @@ C4Bomb_Plant(base_player planter)
 	/* place directly below */
 	traceline(planter.origin, planter.origin + [0,0,-64], FALSE, planter);
 	setorigin(bomb, trace_endpos);
+	bomb.SendFlags = -1;
 
 	Radio_BroadcastMessage(RADIO_BOMBPL);
 	g_cs_bombplanted = TRUE;
 }
+#endif
+
+#ifdef CLIENT
+void
+item_c4::DrawLED(void)
+{
+	vector vecPlayer;
+
+	int s = (float)getproperty(VF_ACTIVESEAT);
+	pSeat = &g_seats[s];
+	vecPlayer = pSeat->m_vecPredictedOrigin;
+
+	m_flAlpha -= frametime;
+
+	if (m_flAlpha <= 0.0f)
+		m_flAlpha = 1.0f;
+
+	if (m_flAlpha > 0) {
+		vector forg;
+		vector fsize;
+		float falpha;
+		
+		/* Scale the glow somewhat with the players distance */
+		fsize = [16,16];
+		fsize *= bound(1, vlen(vecPlayer - origin) / 256, 4);
+
+		/* Fade out when the player is starting to move away */
+		falpha = 1 - bound(0, vlen(vecPlayer - origin) / 1024, 1);
+		falpha *= m_flAlpha;
+
+		/* Nudge this slightly towards the camera */
+		makevectors(vectoangles(origin - vecPlayer));
+		forg = (origin + [0,0,8]) + (v_forward * -16);
+
+		/* Project it, always facing the player */
+		makevectors(view_angles);
+		R_BeginPolygon(g_c4bombled_spr, 1, 0);
+		R_PolygonVertex(forg + v_right * fsize[0] - v_up * fsize[1],
+			[1,1], [1,1,1], falpha);
+		R_PolygonVertex(forg - v_right * fsize[0] - v_up * fsize[1],
+			[0,1], [1,1,1], falpha);
+		R_PolygonVertex(forg - v_right * fsize[0] + v_up * fsize[1],
+			[0,0], [1,1,1], falpha);
+		R_PolygonVertex(forg + v_right * fsize[0] + v_up * fsize[1],
+			[1,0], [1,1,1], falpha);
+		R_EndPolygon();
+	}
+}
+
+float
+item_c4::predraw(void)
+{
+	DrawLED();
+	addentity(this);
+	return PREDRAW_NEXT;
+}
+
+void
+item_c4::item_c4(void)
+{
+	solid = SOLID_BBOX;
+	movetype = MOVETYPE_NONE;
+	drawmask = MASK_ENGINE;
+}
+
+void
+w_c4bomb_parse(void)
+{
+	item_c4 tm = (item_c4)self;
+	spawnfunc_item_c4();
+
+	tm.origin[0] = readcoord();
+	tm.origin[1] = readcoord();
+	tm.origin[2] = readcoord();
+	tm.angles[0] = readcoord();
+	tm.angles[1] = readcoord();
+	tm.angles[2] = readcoord();
+	tm.modelindex = readshort();
+	setorigin(tm, tm.origin);
+	setsize(tm, [-6,-6,0], [6,6,6]);
+}
+#endif
diff --git a/src/shared/cstrike/item_c4bomb.h b/src/shared/cstrike/item_c4bomb.h
new file mode 100644
index 00000000..4373dc87
--- /dev/null
+++ b/src/shared/cstrike/item_c4bomb.h
@@ -0,0 +1,8 @@
+#ifdef SERVER
+void C4Bomb_Plant(base_player); 
+#endif
+
+#ifdef CLIENT
+string g_c4bombled_spr;
+void w_c4bomb_parse(void);
+#endif
diff --git a/src/shared/entities.h b/src/shared/entities.h
index ecd4d74b..53494e4f 100644
--- a/src/shared/entities.h
+++ b/src/shared/entities.h
@@ -14,6 +14,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* TODO: Split game-specific ones into one of the shared folders... */
 enum
 {
 	ENT_ENTITY = 1,
@@ -24,6 +25,9 @@ enum
 	ENT_SPRAY,
 #ifdef VALVE
 	ENT_TRIPMINE,
+#endif
+#ifdef CSTRIKE
+	ENT_C4BOMB,
 #endif
 	ENT_DECAL
 };