diff --git a/.gitattributes b/.gitattributes
index fd5078245cd..33256e799c6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1181,6 +1181,7 @@ res/cardsfolder/b/bonfire_of_the_damned.txt -text
 res/cardsfolder/b/booby_trap.txt -text
 res/cardsfolder/b/book_burning.txt -text
 res/cardsfolder/b/book_of_rass.txt svneol=native#text/plain
+res/cardsfolder/b/boom_bust.txt -text
 res/cardsfolder/b/boomerang.txt svneol=native#text/plain
 res/cardsfolder/b/boon_reflection.txt svneol=native#text/plain
 res/cardsfolder/b/borborygmos.txt svneol=native#text/plain
@@ -2098,6 +2099,7 @@ res/cardsfolder/c/crescendo_of_war.txt -text
 res/cardsfolder/c/crested_craghorn.txt -text
 res/cardsfolder/c/crevasse.txt svneol=native#text/plain
 res/cardsfolder/c/crib_swap.txt svneol=native#text/plain
+res/cardsfolder/c/crime_punishment.txt -text
 res/cardsfolder/c/crimson_acolyte.txt svneol=native#text/plain
 res/cardsfolder/c/crimson_hellkite.txt -text
 res/cardsfolder/c/crimson_kobolds.txt svneol=native#text/plain
diff --git a/res/cardsfolder/b/boom_bust.txt b/res/cardsfolder/b/boom_bust.txt
new file mode 100644
index 00000000000..1f32915f3bd
--- /dev/null
+++ b/res/cardsfolder/b/boom_bust.txt
@@ -0,0 +1,17 @@
+Name:Boom
+ManaCost:1 R
+AlternateMode: Split
+Types:Sorcery
+A:SP$ Destroy | Cost$ 1 R | TgtPrompt$ Choose target land you control to destroy | ValidTgts$ Land.YouCtrl | SubAbility$ DestroyOpp | SpellDescription$ Destroy target land you control and target land you don't control.
+SVar:DestroyOpp:DB$ Destroy | TgtPrompt$ Choose target land you don't control to destroy | ValidTgts$ Land.YouDontCtrl
+SVar:Picture:http://www.wizards.com/global/images/magic/general/boombust.jpg
+Oracle:Destroy target land you control and target land you don't control.
+
+ALTERNATE
+
+Name:Bust
+ManaCost:5 R
+Types:Sorcery
+A:SP$ DestroyAll | Cost$ 5 R | ValidCards$ Land | SpellDescription$ Destroy all lands.
+Oracle:Destroy all lands.
+SetInfo:PLC Rare
\ No newline at end of file
diff --git a/res/cardsfolder/c/crime_punishment.txt b/res/cardsfolder/c/crime_punishment.txt
new file mode 100644
index 00000000000..f2f3aab1ca3
--- /dev/null
+++ b/res/cardsfolder/c/crime_punishment.txt
@@ -0,0 +1,17 @@
+Name:Crime
+ManaCost:3 W B
+AlternateMode: Split
+Types:Sorcery
+A:SP$ ChangeZone | Cost$ 3 W B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature or enchantment in an opponent's graveyard | ValidTgts$ Creature.OppCtrl,Enchantment.OppCtrl | SpellDescription$ Put target creature or enchantment card from an opponent's graveyard onto the battlefield under your control.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/crimepunishment.jpg
+Oracle:Put target creature or enchantment card from an opponent's graveyard onto the battlefield under your control.
+
+ALTERNATE
+
+Name:Punishment
+ManaCost:X B G
+Types:Sorcery
+A:SP$ DestroyAll | Cost$ X B G | ValidCards$ Artifact.cmcEQX,Creature.cmcEQX,Enchantment.cmcEQX | References$ X | SpellDescription$ Destroy each artifact, creature, and enchantment with converted mana cost X.
+SVar:X:Count$xPaid
+Oracle:Destroy each artifact, creature, and enchantment with converted mana cost X.
+SetInfo:DIS Rare
\ No newline at end of file