diff --git a/.gitattributes b/.gitattributes
index 749e78f9781..8ec488bbc6a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3691,6 +3691,7 @@ res/cardsfolder/f/fleshformer.txt svneol=native#text/plain
 res/cardsfolder/f/fleshgrafter.txt svneol=native#text/plain
 res/cardsfolder/f/fleshwrither.txt svneol=native#text/plain
 res/cardsfolder/f/flicker.txt svneol=native#text/plain
+res/cardsfolder/f/flickerform.txt -text
 res/cardsfolder/f/flickering_spirit.txt svneol=native#text/plain
 res/cardsfolder/f/flickering_ward.txt -text
 res/cardsfolder/f/flickerwisp.txt svneol=native#text/plain
diff --git a/res/cardsfolder/f/flickerform.txt b/res/cardsfolder/f/flickerform.txt
new file mode 100644
index 00000000000..bb7dc66fd47
--- /dev/null
+++ b/res/cardsfolder/f/flickerform.txt
@@ -0,0 +1,22 @@
+Name:Flickerform
+ManaCost:1 W
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump
+A:AB$ Pump | Cost$ 2 W W | Defined$ Enchanted | ImprintCards$ Enchanted | StackDescription$ None | SubAbility$ DBRemAura | SpellDescription$ Exile enchanted creature and all Auras attached to it. At the beginning of the next end step, return that card to the battlefield under its owner's control. If you do, return those Auras to the battlefield under their owners' control attached to that creature.
+SVar:DBRemAura:DB$ PumpAll | ValidCards$ Card.IsImprinted,Aura.AttachedTo Creature.IsImprinted | RememberAllPumped$ True | StackDescription$ None | SubAbility$ DBChangeZoneAll
+SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Origin$ Battlefield | Destination$ Exile | ChangeType$ Card.IsRemembered | SubAbility$ DelayedEffect
+SVar:DelayedEffect:DB$ Effect | Name$ Flickerform Effect | Triggers$ TrigEOT | SVars$ FlickerformReturn,FlickerformAttach,DBAllAuraAttach,FlickerformCleanup,ClearImprint | RememberObjects$ Remembered | ImprintCards$ Imprinted | Duration$ Permanent | SubAbility$ DBCleanup
+SVar:TrigEOT:Mode$ Phase | Phase$ End of Turn | Execute$ FlickerformReturn | TriggerZones$ Command | TriggerDescription$ At the beginning of the next end step, return that card to the battlefield under its owner's control.
+SVar:FlickerformReturn:AB$ ChangeZoneAll | Cost$ 0 | ChangeType$ Card.IsRemembered+IsImprinted | Origin$ Exile | Destination$ Battlefield | SubAbility$ ClearImprint
+SVar:ClearImprint:DB$ Cleanup | ClearImprinted$ True | SubAbility$ FlickerformAttach
+SVar:FlickerformAttach:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Aura.IsRemembered | Zone$ Exile | RepeatSubAbility$ DBAllAuraAttach | SubAbility$ FlickerformCleanup
+SVar:DBAllAuraAttach:DB$ ChangeZone | Defined$ Imprinted | Origin$ Exile | Destination$ Battlefield | AttachedTo$ Valid Creature.IsRemembered
+SVar:FlickerformCleanup:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/flickerform.jpg
+Oracle:Enchant creature\n{2}{W}{W}: Exile enchanted creature and all Auras attached to it. At the beginning of the next end step, return that card to the battlefield under its owner's control. If you do, return those Auras to the battlefield under their owners'control attached to that creature.
+SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/18.jpg
+End
\ No newline at end of file