diff --git a/.gitattributes b/.gitattributes
index cf4074be545..210b8ad4c96 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1270,6 +1270,7 @@ res/cardsfolder/b/brothers_of_fire.txt svneol=native#text/plain
 res/cardsfolder/b/browbeat.txt -text
 res/cardsfolder/b/brown_ouphe.txt svneol=native#text/plain
 res/cardsfolder/b/browse.txt svneol=native#text/plain
+res/cardsfolder/b/bruna_light_of_alabaster.txt -text
 res/cardsfolder/b/brush_with_death.txt svneol=native#text/plain
 res/cardsfolder/b/brushland.txt svneol=native#text/plain
 res/cardsfolder/b/brushstrider.txt -text
diff --git a/res/cardsfolder/b/bruna_light_of_alabaster.txt b/res/cardsfolder/b/bruna_light_of_alabaster.txt
new file mode 100644
index 00000000000..62f1fd9367c
--- /dev/null
+++ b/res/cardsfolder/b/bruna_light_of_alabaster.txt
@@ -0,0 +1,20 @@
+Name:Bruna, Light of Alabaster
+ManaCost:3 W W U
+Types:Legendary Creature Angel
+Text:no text
+PT:5/5
+K:Flying
+K:Vigilance
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ Aurify | TriggerDescription$ Whenever CARDNAME attacks or blocks, you may attach to it any number of Auras on the battlefield and you may put onto the battlefield attached to it any number of Aura cards that could enchant it from your graveyard and/or hand.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ Aurify | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, you may attach to it any number of Auras on the battlefield and you may put onto the battlefield attached to it any number of Aura cards that could enchant it from your graveyard and/or hand.
+SVar:Aurify:AB$ RepeatEach | Cost$ 0 | RepeatSubAbility$ BrunaAttach | RepeatCards$ Aura.CanEnchantSource+NotAttachedTo | SubAbility$ HandAuras
+SVar:BrunaAttach:DB$ Attach | Object$ Remembered | Defined$ Self | Optional$ True
+SVar:HandAuras:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Aura.CanEnchantSource+YouCtrl | AttachedTo$ Self | ChangeNum$ HandX | Optional$ True | Hidden$ True | SubAbility$ GraveAuras
+SVar:GraveAuras:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Aura.CanEnchantSource+YouCtrl | AttachedTo$ Self | ChangeNum$ GraveX | Optional$ True | Hidden$ True
+SVar:HandX:Count$ValidHand Aura.CanEnchantSource+YouCtrl
+SVar:GraveX:Count$ValidGraveyard Aura.CanEnchantSource+YouCtrl
+SVar:Rarity:Mythic
+SVar:Picture:http://www.wizards.com/global/images/magic/general/bruna_light_of_alabaster.jpg
+SetInfo:AVR|Mythic|http://magiccards.info/scans/en/avr/208.jpg
+Oracle:Flying, vigilance\nWhenever Bruna, Light of Alabaster attacks or blocks, you may attach to it any number of Auras on the battlefield and you may put onto the battlefield attached to it any number of Aura cards that could enchant it from your graveyard and/or hand.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 4539d91b521..8c1b88dd201 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -6433,6 +6433,10 @@ public class Card extends GameEntity implements Comparable<Card> {
                     return false;
                 }
             }
+        } else if (property.equals("NotAttachedTo")) {
+            if (this.equipping.contains(source) || source.equals(this.enchanting)) {
+                return false;
+            }
         } else if (property.startsWith("EnchantedBy")) {
             if (!this.getEnchantedBy().contains(source) && !this.equals(source.getEnchanting())) {
                 return false;