diff --git a/.gitattributes b/.gitattributes
index e9f1b212181..70d86008c4f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13047,6 +13047,7 @@ forge-gui/res/cardsfolder/t/tablet_of_epityr.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/t/tablet_of_the_guilds.txt -text
 forge-gui/res/cardsfolder/t/tahngarth.txt -text
 forge-gui/res/cardsfolder/t/tahngarth_talruum_hero.txt svneol=native#text/plain
+forge-gui/res/cardsfolder/t/tahngarths_glare.txt -text
 forge-gui/res/cardsfolder/t/tahngarths_rage.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/t/taiga.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/t/tainted_aether.txt svneol=native#text/plain
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java
index 7538396b35b..881700de294 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java
@@ -13,6 +13,8 @@ import forge.util.Lang;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.collect.Iterables;
+
 public class RearrangeTopOfLibraryEffect extends SpellAbilityEffect {
 
     /* (non-Javadoc)
@@ -99,7 +101,11 @@ public class RearrangeTopOfLibraryEffect extends SpellAbilityEffect {
      *            a boolean.
      */
     private void rearrangeTopOfLibrary(final Card src, final Player player, final int numCards, final boolean mayshuffle, final SpellAbility sa) {
-        final Player activator = sa.getActivatingPlayer();
+        final Player activator = sa.hasParam("RearrangePlayer") ? Iterables.getFirst(AbilityUtils.getDefinedPlayers(src, sa.getParam("RearrangePlayer"), sa), null)
+                : sa.getActivatingPlayer();
+        if (activator == null) {
+            return;
+        }
         final PlayerZone lib = player.getZone(ZoneType.Library);
         int maxCards = lib.size();
         // If library is smaller than N, only show that many cards
diff --git a/forge-gui/res/cardsfolder/t/tahngarths_glare.txt b/forge-gui/res/cardsfolder/t/tahngarths_glare.txt
new file mode 100644
index 00000000000..d870a6cb81b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/t/tahngarths_glare.txt
@@ -0,0 +1,7 @@
+Name:Tahngarth's Glare
+ManaCost:R
+Types:Sorcery
+A:SP$ RearrangeTopOfLibrary | Cost$ R | ValidTgts$ Opponent | NumCards$ 3 | SubAbility$ DBRearange | SpellDescription$ Look at the top three cards of target opponent's library, then put them back in any order. That player looks at the top three cards of your library, then puts them back in any order.
+SVar:DBRearange:DB$ RearrangeTopOfLibrary | Defined$ You | RearrangePlayer$ Targeted | NumCards$ 3
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/tahngarths_glare.jpg
\ No newline at end of file