diff --git a/.gitattributes b/.gitattributes
index ebabcee57bb..7e6885d2e84 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3023,6 +3023,7 @@ res/cardsfolder/g/gigantomancer.txt svneol=native#text/plain
 res/cardsfolder/g/gigapede.txt svneol=native#text/plain
 res/cardsfolder/g/gilded_lotus.txt svneol=native#text/plain
 res/cardsfolder/g/gilder_bairn.txt svneol=native#text/plain
+res/cardsfolder/g/gilt_leaf_ambush.txt -text
 res/cardsfolder/g/gilt_leaf_archdruid.txt svneol=native#text/plain
 res/cardsfolder/g/gilt_leaf_palace.txt svneol=native#text/plain
 res/cardsfolder/g/gilt_leaf_seer.txt svneol=native#text/plain
diff --git a/res/cardsfolder/g/gilt_leaf_ambush.txt b/res/cardsfolder/g/gilt_leaf_ambush.txt
new file mode 100644
index 00000000000..15d960c785c
--- /dev/null
+++ b/res/cardsfolder/g/gilt_leaf_ambush.txt
@@ -0,0 +1,12 @@
+Name:Gilt-Leaf Ambush
+ManaCost:2 G
+Types:Tribal Instant Elf
+Text:no text
+A:SP$ Token | Cost$ 2 G | TokenAmount$ 2 | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SubAbility$ SVar=DBClash | RememberTokens$ True | SpellDescription$ Put two 1/1 green Elf Warrior creature tokens onto the battlefield. Clash with an opponent. If you win, those creatures gain deathtouch until end of turn.
+SVar:DBClash:DB$Clash | WinSubAbility$ AdditionalPump
+SVar:AdditionalPump:DB$PumpAll | ValidCards$ Creature.IsRemembered | KW$ Deathtouch | SubAbility$ SVar=DBCleanUp
+SVar:DBCleanUp:DB$Cleanup | ClearRemembered$ True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gilt_leaf_ambush.jpg
+SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/214.jpg
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java
index b2b2eadb583..8d8ec68071b 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java
@@ -408,6 +408,7 @@ public class AbilityFactory_Token extends AbilityFactory {
         int finalToughness = AbilityFactory.calculateAmount(AF.getHostCard(), tokenToughness, sa);
         int finalAmount = AbilityFactory.calculateAmount(AF.getHostCard(), tokenAmount, sa);
 
+        String remember = AF.getMapParams().get("RememberTokens");
         for (int i = 0; i < finalAmount; i++) {
             CardList tokens = CardFactoryUtil.makeToken(tokenName, imageName, controller, cost, tokenTypes, finalPower, finalToughness, tokenKeywords);
 
@@ -459,7 +460,7 @@ public class AbilityFactory_Token extends AbilityFactory {
                     }
                 }
             }
-            
+
             //Grant static abilities
             if (tokenStaticAbilities != null) {
                 for (String s : tokenStaticAbilities) {
@@ -477,6 +478,9 @@ public class AbilityFactory_Token extends AbilityFactory {
                 if (tokenAttacking) {
                     AllZone.getCombat().addAttacker(c);
                 }
+                if (remember != null) {
+                    AF.getHostCard().addRemembered(c);
+                }
             }
         }
     }