diff --git a/.gitattributes b/.gitattributes
index f86e30ee8c6..a8d4be30e76 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8564,6 +8564,7 @@ res/cardsfolder/t/tel_jilad_justice.txt svneol=native#text/plain
 res/cardsfolder/t/tel_jilad_lifebreather.txt svneol=native#text/plain
 res/cardsfolder/t/tel_jilad_outrider.txt svneol=native#text/plain
 res/cardsfolder/t/tel_jilad_wolf.txt svneol=native#text/plain
+res/cardsfolder/t/telekinesis.txt -text
 res/cardsfolder/t/telekinetic_bonds.txt svneol=native#text/plain
 res/cardsfolder/t/telekinetic_sliver.txt svneol=native#text/plain
 res/cardsfolder/t/telemin_performance.txt -text
diff --git a/res/cardsfolder/t/telekinesis.txt b/res/cardsfolder/t/telekinesis.txt
new file mode 100644
index 00000000000..21135fd7d0a
--- /dev/null
+++ b/res/cardsfolder/t/telekinesis.txt
@@ -0,0 +1,12 @@
+Name:Telekinesis
+ManaCost:U U
+Types:Instant
+Text:no text
+A:SP$ Tap | Cost$ U U | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Tap target creature. Prevent all combat damage that would be dealt by that creature this turn. It doesn't untap during its controller's next two untap steps.
+SVar:DBPump:DB$Pump | Cost$ 0 | Defined$ Targeted | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. | SubAbility$ DBPump2
+SVar:DBPump2:DB$Pump | Cost$ 0 | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next two untap steps. | Permanent$ True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/telekinesis.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/79.jpg
+Oracle:Tap target creature. Prevent all combat damage that would be dealt by that creature this turn. It doesn't untap during its controller's next two untap steps.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/PhaseUtil.java b/src/main/java/forge/PhaseUtil.java
index f5004f1f878..8ad0f339231 100644
--- a/src/main/java/forge/PhaseUtil.java
+++ b/src/main/java/forge/PhaseUtil.java
@@ -390,6 +390,10 @@ public class PhaseUtil {
         for (final Card c : list) {
             c.removeAllExtrinsicKeyword("This card doesn't untap during your next untap step.");
             c.removeAllExtrinsicKeyword("HIDDEN This card doesn't untap during your next untap step.");
+            if (c.hasKeyword("This card doesn't untap during your next two untap steps.")) {
+                c.removeAllExtrinsicKeyword("HIDDEN This card doesn't untap during your next two untap steps.");
+                c.addHiddenExtrinsicKeyword("This card doesn't untap during your next untap step.");
+            }
         }
     } // end doUntap
 
@@ -405,7 +409,8 @@ public class PhaseUtil {
     public static boolean canUntap(final Card c) {
 
         if (c.hasKeyword("CARDNAME doesn't untap during your untap step.")
-                || c.hasKeyword("This card doesn't untap during your next untap step.")) {
+                || c.hasKeyword("This card doesn't untap during your next untap step.")
+                || c.hasKeyword("This card doesn't untap during your next two untap steps.")) {
             return false;
         }