diff --git a/.gitattributes b/.gitattributes
index 223fe1d54ab..f091189dd5e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -349,6 +349,7 @@ res/cardsfolder/barrage_ogre.txt -text svneol=native#text/plain
 res/cardsfolder/barren_glory.txt -text svneol=native#text/plain
 res/cardsfolder/barren_moor.txt -text svneol=native#text/plain
 res/cardsfolder/barrenton_cragtreads.txt -text svneol=native#text/plain
+res/cardsfolder/barrin_master_wizard.txt -text svneol=native#text/plain
 res/cardsfolder/bartel_runeaxe.txt -text svneol=native#text/plain
 res/cardsfolder/baru_fist_of_krosa.txt -text svneol=native#text/plain
 res/cardsfolder/basal_thrull.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/barrin_master_wizard.txt b/res/cardsfolder/barrin_master_wizard.txt
new file mode 100644
index 00000000000..174e9fbaf78
--- /dev/null
+++ b/res/cardsfolder/barrin_master_wizard.txt
@@ -0,0 +1,9 @@
+Name:Barrin, Master Wizard
+ManaCost:1 U U
+Types:Legendary Creature Human Wizard
+Text:no text
+PT:1/1
+A:AB$Bounce|Cost$2 Sac<1/Permanent>|ValidTgts$Creature|TgtPrompt$Select target Creature|Destination$Hand|SpellDescription$Return target creature to its owner's hand.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/barrin_master_wizard.jpg
+End
diff --git a/src/forge/AbilityFactory.java b/src/forge/AbilityFactory.java
index e9453c5d89e..895e7516bb5 100644
--- a/src/forge/AbilityFactory.java
+++ b/src/forge/AbilityFactory.java
@@ -212,6 +212,14 @@ public class AbilityFactory {
 			}
 		}
 		
+		if (API.equals("Bounce")){
+			if (isAb)
+				SA = AbilityFactory_Bounce.createAbilityBounce(this);
+			if (isSp){
+				SA = AbilityFactory_Bounce.createSpellBounce(this);
+			}
+		}
+		
 		// *********************************************
 		// set universal properties of the SpellAbility
         if (hasSpDesc)