1 files changed, 10 insertions, 1 deletions
diff --git a/crawl-ref/source/Kills.cc b/crawl-ref/source/Kills.cc
index 733cd5c5ce..6da4e56a28 100644
--- a/crawl-ref/source/Kills.cc
+++ b/crawl-ref/source/Kills.cc
@@ -356,7 +356,16 @@ std::string apostrophise(const std::string &name)
         return (name);
 
     const char lastc = name[name.length() - 1];
-    return (name + (lastc == 's' || lastc == 'x' ? "'" : "'s"));
+    return (name + (lastc == 's' ? "'" : "'s"));
+}
+
+std::string apostrophise_fixup(const std::string &msg)
+{
+    if (msg.empty())
+        return (msg);
+
+    // XXX: This is rather hackish.
+    return (replace_all(msg, "s's", "s'"));
 }
 
 // For monster names ending with these suffixes, we pluralise directly without