diff --git a/.gitattributes b/.gitattributes
index acd9e88ef41..da21ccdfa2b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2394,6 +2394,7 @@ res/cardsfolder/d/duergar_hedge_mage.txt svneol=native#text/plain
 res/cardsfolder/d/duergar_mine_captain.txt svneol=native#text/plain
 res/cardsfolder/d/dune_brood_nephilim.txt svneol=native#text/plain
 res/cardsfolder/d/dunerider_outlaw.txt svneol=native#text/plain
+res/cardsfolder/d/dungeon_geists.txt -text
 res/cardsfolder/d/dungeon_shade.txt svneol=native#text/plain
 res/cardsfolder/d/dungrove_elder.txt svneol=native#text/plain
 res/cardsfolder/d/duress.txt svneol=native#text/plain
diff --git a/res/cardsfolder/d/dungeon_geists.txt b/res/cardsfolder/d/dungeon_geists.txt
new file mode 100644
index 00000000000..1b9d295d66c
--- /dev/null
+++ b/res/cardsfolder/d/dungeon_geists.txt
@@ -0,0 +1,15 @@
+Name:Dungeon Geists
+ManaCost:2 U U
+Types:Creature Spirit
+Text:no text
+PT:3/3
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap for as long as you control CARDNAME.
+SVar:TrigTap:AB$ Tap | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ CARDNAME doesn't untap during your untap step. | UntilLoseControlOfHost$ True
+SVar:PlayMain1:TRUE
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dungeon_geists.jpg
+SetInfo:DKA|Rare|http://magiccards.info/scans/en/dka/36.jpg
+Oracle:Flying\nWhen Dungeon Geists enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's untap step for as long as you control Dungeon Geists.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
index 2ebc923df2c..36ffa86fd71 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
@@ -1010,7 +1010,10 @@ public class AbilityFactoryPump {
                 AllZone.getEndOfCombat().addUntil(untilEOT);
             } else if (this.params.containsKey("UntilYourNextUpkeep")) {
                 AllZone.getUpkeep().addUntil(sa.getActivatingPlayer(), untilEOT);
-            } else {
+            } else if (this.params.containsKey("UntilLoseControlOfHost")) {
+                sa.getSourceCard().addLeavesPlayCommand(untilEOT);
+                sa.getSourceCard().addChangeControllerCommand(untilEOT);
+            }  else {
                 AllZone.getEndOfTurn().addUntil(untilEOT);
             }
         }