diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c
index e63974921..b1ed7e63b 100644
--- a/src/common/gamecode/randenc.c
+++ b/src/common/gamecode/randenc.c
@@ -682,7 +682,7 @@ drown(region *r)
 #else
       int amphibian_level = 0;
 #endif
-			if (u->ship || u->race == new_race[RC_SPELL]) {
+			if (u->ship || u->race == new_race[RC_SPELL] || u->number==0) {
 				up=&u->next;
 				continue;
 			}
diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c
index ccfb7338a..02ee1a7c4 100644
--- a/src/common/kernel/item.c
+++ b/src/common/kernel/item.c
@@ -1098,11 +1098,18 @@ use_bloodpotion(struct unit *u, const struct item_type *itype, int amount, struc
   if (u->race == new_race[RC_DAEMON]  ) {
     change_effect(u, itype->rtype->ptype, 100*amount);
   } else {
-    trigger * trestore = trigger_changerace(u, u->race, u->irace);
-    int duration = 2 + rng_int() % 8;
+    static race * rcfailure;
+    if (!rcfailure) {
+      rcfailure = rc_find("smurf");
+      if (!rcfailure) rcfailure = rc_find("toad");
+    }
+    if (rcfailure) {
+      trigger * trestore = trigger_changerace(u, u->race, u->irace);
+      int duration = 2 + rng_int() % 8;
 
-    add_trigger(&u->attribs, "timer", trigger_timeout(duration, trestore));
-    u->irace = u->race = new_race[RC_TOAD];
+      add_trigger(&u->attribs, "timer", trigger_timeout(duration, trestore));
+      u->irace = u->race = rcfailure;
+    }
   }
   use_pooled(u, itype->rtype, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, amount);
   usetpotionuse(u, itype->rtype->ptype);
diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml
index d83dbd129..257c467d3 100644
--- a/src/res/de/strings.xml
+++ b/src/res/de/strings.xml
@@ -2948,6 +2948,23 @@
       <text locale="en">braineater</text>
     </string>
 
+    <string name="smurf">
+      <text locale="de">Schlumpf</text>
+      <text locale="en">smurf</text>
+    </string>
+    <string name="smurf_p">
+      <text locale="de">Schlümpfe</text>
+      <text locale="en">smurfs</text>
+    </string>
+    <string name="smurf_x">
+      <text locale="de">Schlumpf</text>
+      <text locale="en">smurf</text>
+    </string>
+    <string name="smurf_d">
+      <text locale="de">Schlümpfen</text>
+      <text locale="en">smurfs</text>
+    </string>
+
     <string name="toad">
       <text locale="de">Kröte</text>
       <text locale="en">toad</text>
diff --git a/src/res/races.xml b/src/res/races.xml
index bdf8b0763..dac83c8a9 100644
--- a/src/res/races.xml
+++ b/src/res/races.xml
@@ -608,6 +608,38 @@
     <skill name="stamina" modifier="-10"/>
     <attack type="4" damage="1d2"/>
   </race>
+  <race name="smurf" weight="1000" capacity="540" speed="1.000000" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
+    <ai splitsize="1" learn="yes"/>
+    <skill name="alchemy" modifier="-10"/>
+    <skill name="crossbow" modifier="-10"/>
+    <skill name="mining" modifier="-10"/>
+    <skill name="bow" modifier="-10"/>
+    <skill name="building" modifier="-10"/>
+    <skill name="trade" modifier="-10"/>
+    <skill name="forestry" modifier="-10"/>
+    <skill name="catapult" modifier="-10"/>
+    <skill name="herbalism" modifier="-10"/>
+    <skill name="magic" modifier="-10"/>
+    <skill name="training" modifier="-10"/>
+    <skill name="riding" modifier="-10"/>
+    <skill name="armorer" modifier="-10"/>
+    <skill name="shipcraft" modifier="-10"/>
+    <skill name="melee" modifier="-10"/>
+    <skill name="sailing" modifier="-10"/>
+    <skill name="polearm" modifier="-10"/>
+    <skill name="espionage" modifier="-10"/>
+    <skill name="quarrying" modifier="-10"/>
+    <skill name="roadwork" modifier="-10"/>
+    <skill name="tactics" modifier="-10"/>
+    <skill name="stealth" modifier="2"/>
+    <skill name="entertainment" modifier="-10"/>
+    <skill name="weaponsmithing" modifier="-10"/>
+    <skill name="cartmaking" modifier="-10"/>
+    <skill name="perception" modifier="-10"/>
+    <skill name="taxation" modifier="-10"/>
+    <skill name="stamina" modifier="-10"/>
+    <attack type="4" damage="1d2"/>
+  </race>
   <race name="alp" magres="0.950000" maxaura="1.000000" regaura="1.000000" recruitcost="50000" weight="0" capacity="0" speed="1.500000" hp="20" ac="2" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="2" defensemodifier="20" fly="yes" walk="yes" nolearn="yes" noteach="yes">
     <ai splitsize="1"/>
     <attack type="1" damage="1d4"/>