diff --git a/.gitattributes b/.gitattributes
index 46157388cfd..6b2de4b0a0a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9716,6 +9716,7 @@ res/cardsfolder/w/woolly_thoctar.txt svneol=native#text/plain
 res/cardsfolder/w/word_of_binding.txt svneol=native#text/plain
 res/cardsfolder/w/word_of_blasting.txt svneol=native#text/plain
 res/cardsfolder/w/word_of_seizing.txt svneol=native#text/plain
+res/cardsfolder/w/word_of_undoing.txt -text
 res/cardsfolder/w/words_of_wisdom.txt svneol=native#text/plain
 res/cardsfolder/w/workhorse.txt svneol=native#text/plain
 res/cardsfolder/w/world_queller.txt -text
diff --git a/res/cardsfolder/o/orcish_farmer.txt b/res/cardsfolder/o/orcish_farmer.txt
index ab07834d695..5769aacba33 100644
--- a/res/cardsfolder/o/orcish_farmer.txt
+++ b/res/cardsfolder/o/orcish_farmer.txt
@@ -7,4 +7,7 @@ A:AB$ Animate | Cost$ T | ValidTgts$ Land | TgtPrompt$ Select target land | Type
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_farmers.jpg
+SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/256.jpg
+SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/207.jpg
+Oracle:{T}: Target land becomes a Swamp until its controller's next untap step.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/w/word_of_undoing.txt b/res/cardsfolder/w/word_of_undoing.txt
new file mode 100644
index 00000000000..b8c6c69763e
--- /dev/null
+++ b/res/cardsfolder/w/word_of_undoing.txt
@@ -0,0 +1,12 @@
+Name:Word of Undoing
+ManaCost:U
+Types:Instant
+Text:no text
+A:SP$ ChangeZone | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBChangeZoneAll | RememberTargets$ True | SpellDescription$ Return target creature and all white Auras you own attached to it to their owners' hands.
+SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Remembered.Aura+White+Attached+YouOwn | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/word_of_undoing.jpg
+SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/108.jpg
+Oracle:Return target creature and all white Auras you own attached to it to their owners' hands.
+End
\ No newline at end of file