diff --git a/.gitattributes b/.gitattributes
index fd3d6b540a8..52052143c1e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -360,6 +360,7 @@ res/cardsfolder/a/archangel.txt svneol=native#text/plain
 res/cardsfolder/a/archdemon_of_unx.txt svneol=native#text/plain
 res/cardsfolder/a/architects_of_will.txt svneol=native#text/plain
 res/cardsfolder/a/archivist.txt svneol=native#text/plain
+res/cardsfolder/a/archmage_ascension.txt -text
 res/cardsfolder/a/archon_of_justice.txt svneol=native#text/plain
 res/cardsfolder/a/archon_of_redemption.txt svneol=native#text/plain
 res/cardsfolder/a/arctic_flats.txt svneol=native#text/plain
diff --git a/res/cardsfolder/a/archmage_ascension.txt b/res/cardsfolder/a/archmage_ascension.txt
new file mode 100644
index 00000000000..f2a48e5fcf1
--- /dev/null
+++ b/res/cardsfolder/a/archmage_ascension.txt
@@ -0,0 +1,14 @@
+Name:Archmage Ascension
+ManaCost:2 U
+Types:Enchantment
+Text:no text
+T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE2 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of each end step, if you drew two or more cards this turn, you may put a quest counter on CARDNAME.
+R:Event$ Draw | ValidPlayer$ You | ReplaceWith$ Tutor | CheckSVar$ Y | SVarCompare$ GE6 | Optional$ True | Description$ As long as CARDNAME has six or more quest counters on it, if you would draw a card, you may instead search your library for a card, put that card into your hand, then shuffle your library.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
+SVar:Tutor:AB$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ValidCard$ Card.YouOwn
+SVar:X:Count$YouDrewThisTurn
+SVar:Y:Count$CardCounters.QUEST
+SVar:Picture:http://www.wizards.com/global/images/magic/general/archmage_ascension.jpg
+Oracle:At the beginning of each end step, if you drew two or more cards this turn, you may put a quest counter on Archmage Ascension.\nAs long as Archmage Ascension has six or more quest counters on it, if you would draw a card, you may instead search your library for a card, put that card into your hand, then shuffle your library.
+SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/42.jpg
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index fc8b31abae3..05e4a7cc98e 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -2757,6 +2757,13 @@ public class CardFactoryUtil {
                 return 0;
             }
         }
+        
+        if(sq[0].equals("YouDrewThisTurn")) {
+            return CardFactoryUtil.doXMath(c.getController().getNumDrawnThisTurn(), m, c);
+        }
+        if(sq[0].equals("OppDrewThisTurn")) {
+            return CardFactoryUtil.doXMath(c.getController().getOpponent().getNumDrawnThisTurn(), m, c);
+        }
 
         if (sq[0].equals("StormCount")) {
             return CardFactoryUtil.doXMath(AllZone.getStack().getCardsCastThisTurn().size() - 1, m, c);