diff --git a/code/game/ai_dmq3.c b/code/game/ai_dmq3.c
index 4ef429f..d3a4137 100644
--- a/code/game/ai_dmq3.c
+++ b/code/game/ai_dmq3.c
@@ -1699,7 +1699,7 @@ void BotChooseWeapon(bot_state_t *bs) {
 			newweaponnum = WP_PLASMAGUN;
 		} else if ( g_weaponarena.integer == 9 ) {
 			newweaponnum = WP_BFG;
-		} else if ( g_weaponarena.integer == 10 ) {
+		} else if ( g_instantgib.integer > 2 || g_weaponarena.integer == 10 ) {
 			newweaponnum = WP_NAILGUN;
 		} else if ( g_weaponarena.integer == 11 ) {
 			newweaponnum = WP_PROX_LAUNCHER;
diff --git a/code/game/g_client.c b/code/game/g_client.c
index 7c143a6..db66706 100644
--- a/code/game/g_client.c
+++ b/code/game/g_client.c
@@ -1996,6 +1996,10 @@ else
 			 client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_GAUNTLET );
 			 client->ps.ammo[WP_GAUNTLET] = -1;
 		}
+		if(g_instantgib.integer > 2) {
+			client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_NAILGUN );
+			client->ps.ammo[WP_NAILGUN] = -1;
+		}
 	}
         if (g_weaponarena.integer == 1) {
 		client->ps.stats[STAT_WEAPONS] = ( 1 << WP_GAUNTLET );
diff --git a/code/game/g_weapon.c b/code/game/g_weapon.c
index 056dd14..9aa3769 100644
--- a/code/game/g_weapon.c
+++ b/code/game/g_weapon.c
@@ -799,6 +799,10 @@ void Weapon_Nailgun_Fire (gentity_t *ent) {
 		m = fire_nail (ent, muzzle, forward, right, up );
 		m->damage *= s_quadFactor;
 		m->splashDamage *= s_quadFactor;
+
+		if (g_instantgib.integer > 2) {
+			m->damage = 800;
+		}
 	}
 
 //	VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta );	// "real" physics