diff --git a/changelog.txt b/changelog.txt
index 6c8f0dd35e..8a30b2dcaa 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -34,6 +34,7 @@ Template for new versions:
 ## Fixes
 - `advtools`: fix dfhack-added conversation options not appearing in the ask whereabouts conversation tree
 - `gui/rename`: fix error when changing the language of a unit's name
+- `makeown`: fix makeown-ing an enemy of your civilization (such as a giant) constantly giving everyone else vengeful thoughts about them
 
 ## Misc Improvements
 - `assign-preferences`: new ``--show`` option to display the preferences of the selected unit
diff --git a/makeown.lua b/makeown.lua
index 5265287253..5d1899e7a7 100644
--- a/makeown.lua
+++ b/makeown.lua
@@ -279,6 +279,14 @@ local function fix_histfig(unit)
             entity_link(hf, eid, true, false, k)
             ::continue::
         end
+        -- If you're makeown-ing an enemy of your civilization or group, people will feel vengeful without this
+        if el and df.histfig_entity_link_enemyst:is_instance(el) then
+            local eid = el.entity_id
+            if eid == civ_id or eid == group_id then
+                hf.entity_links:erase(k)
+                el:delete()
+            end
+        end
     end
 
     -- add them to our civ/site if they aren't already