diff --git a/config.cpp b/config.cpp
index 5776cb429..34009b6d5 100644
--- a/config.cpp
+++ b/config.cpp
@@ -3522,6 +3522,9 @@ EX int config3 = addHook(hooks_configfile, 100, [] {
   ->set_sets([] { dialog::bound_low(1); })
   ->set_reaction([] { if(game_active) { stop_game(); start_game(); } });
 
+  param_enum(warn_before_killing_friends, "warn_before_killing_friends", 2)
+  ->editable({{"OFF", "never warn"}, {"TAME_BOMBERBIRDS", "warn only for Tame Bomberbirds"}, {"ON", "always warn"}}, "warn before killing friendly monsters", 'W');
+
   param_i(curse_percentage, "curse_percentage")->editable(0, 100, 1,
     "curse percentage",
     "The percentage of towers in Cursed Walls mode to be manned by Canyon Hags", 'R')
diff --git a/pcmove.cpp b/pcmove.cpp
index 9c2807fc4..1918bcffa 100644
--- a/pcmove.cpp
+++ b/pcmove.cpp
@@ -1474,7 +1474,10 @@ EX bool warningprotection(const string& s) {
   return true;
   }
 
+EX int warn_before_killing_friends;
+
 EX bool warningprotection_hit(eMonster m) {
+  if(warn_before_killing_friends < (m == moTameBomberbird ? 1 : 2)) return false;
   if(m && warningprotection(XLAT("Are you sure you want to hit %the1?", m)))
     return true;
   return false;