diff --git a/.gitattributes b/.gitattributes
index 3437ab464af..00537e9eb17 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -622,6 +622,7 @@ forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java -text
 forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java -text
 forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java svneol=native#text/plain
 forge-game/src/main/java/forge/game/trigger/TriggerScry.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java -text
 forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java -text
 forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java svneol=native#text/plain
 forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java svneol=native#text/plain
diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
index 54b88e7a428..f1bb3484341 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
@@ -274,6 +274,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
                     }
                 });
             }
+            // TODO: prevent ai seaching its own library when Ob Nixilis, Unshackled is in play
             if (origin != null && origin.isKnown()) {
                 list = CardLists.getValidCards(list, type, source.getController(), source);
             }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
index 581b562cc02..aaeba18c354 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
@@ -12,9 +12,11 @@ import forge.game.card.CardPredicates;
 import forge.game.card.CardUtil;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
+import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 public class ChangeZoneAllEffect extends SpellAbilityEffect {
@@ -73,6 +75,10 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
                 sa.getActivatingPlayer().incLibrarySearched();
             }
             sa.getActivatingPlayer().getController().reveal(libCards, ZoneType.Library, sa.getActivatingPlayer());
+            final HashMap<String, Object> runParams = new HashMap<String, Object>();
+            runParams.put("Player", sa.getActivatingPlayer());
+            runParams.put("Target", tgtPlayers);
+            game.getTriggerHandler().runTrigger(TriggerType.SearchedLibrary, runParams, false);
         }
         cards = AbilityUtils.filterListByType(cards, sa.getParam("ChangeType"), sa);
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index 4e0309bc05d..6f54c8fddbc 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -3,6 +3,7 @@ package forge.game.ability.effects;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+
 import forge.card.CardCharacteristicName;
 import forge.game.Game;
 import forge.game.GameEntity;
@@ -680,8 +681,15 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
         if (!defined && changeType != null)
             fetchList = AbilityUtils.filterListByType(fetchList, sa.getParam("ChangeType"), sa);
 
-        if (searchedLibrary && decider.equals(player)) { // should only count the number of searching player's own library
-            decider.incLibrarySearched();
+        if (searchedLibrary) {
+            if (decider.equals(player)) {
+                // should only count the number of searching player's own library
+                decider.incLibrarySearched();
+            }
+            final HashMap<String, Object> runParams = new HashMap<String, Object>();
+            runParams.put("Player", decider);
+            runParams.put("Target", Lists.newArrayList(player));
+            decider.getGame().getTriggerHandler().runTrigger(TriggerType.SearchedLibrary, runParams, false);
         }
 
         if (!defined) {
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java b/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java
new file mode 100644
index 00000000000..f84bd472d97
--- /dev/null
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java
@@ -0,0 +1,78 @@
+/*
+ * Forge: Play Magic: the Gathering.
+ * Copyright (C) 2011  Forge Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package forge.game.trigger;
+
+import java.util.List;
+
+import forge.game.card.Card;
+import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+
+/**
+ * <p>
+ * TriggerSearchedLibrary class.
+ * </p>
+ * 
+ * @author Forge
+ * @version $Id: TriggerSearchedLibrary.java 23787 2013-11-24 07:09:23Z Max mtg $
+ */
+public class TriggerSearchedLibrary extends Trigger {
+
+    /**
+     * <p>
+     * Constructor for TriggerSearchedLibrary.
+     * </p>
+     * 
+     * @param params
+     *            a {@link java.util.HashMap} object.
+     * @param host
+     *            a {@link forge.game.card.Card} object.
+     * @param intrinsic
+     *            the intrinsic
+     */
+    public TriggerSearchedLibrary(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
+        super(params, host, intrinsic);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public final boolean performTest(final java.util.Map<String, Object> runParams2) {
+        if (this.mapParams.containsKey("ValidPlayer")) {
+            if (!matchesValid(runParams2.get("Player"), this.mapParams.get("ValidPlayer").split(","),
+                    this.getHostCard())) {
+                return false;
+            }
+        }
+        if (this.mapParams.containsKey("SeachOwnLibrary")) {
+            @SuppressWarnings("unchecked")
+            List<Player> targets = (List<Player>) runParams2.get("Target");
+            if (!targets.contains(runParams2.get("Player"))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+
+    /** {@inheritDoc} */
+    @Override
+    public final void setTriggeringObjects(final SpellAbility sa) {
+        sa.setTriggeringObject("Player", this.getRunParams().get("Player"));
+    }
+}
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerType.java b/forge-game/src/main/java/forge/game/trigger/TriggerType.java
index e4f6cbd20c1..b6932b8cb12 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerType.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerType.java
@@ -54,6 +54,7 @@ public enum TriggerType {
     PlaneswalkedTo(TriggerPlaneswalkedTo.class),
     Sacrificed(TriggerSacrificed.class),
     Scry(TriggerScry.class),
+    SearchedLibrary(TriggerSearchedLibrary.class),
     SetInMotion(TriggerSetInMotion.class),
     Shuffled(TriggerShuffled.class),
     SpellAbilityCast(TriggerSpellAbilityCast.class),