diff --git a/.gitattributes b/.gitattributes
index d04e88d6d4f..8d86b649282 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3387,6 +3387,7 @@ res/cardsfolder/g/goldmeadow_harrier.txt svneol=native#text/plain
 res/cardsfolder/g/goldmeadow_lookout.txt svneol=native#text/plain
 res/cardsfolder/g/golem_artisan.txt svneol=native#text/plain
 res/cardsfolder/g/golem_foundry.txt svneol=native#text/plain
+res/cardsfolder/g/golem_skin_gauntlets.txt -text
 res/cardsfolder/g/golems_heart.txt svneol=native#text/plain
 res/cardsfolder/g/golgari_brownscale.txt svneol=native#text/plain
 res/cardsfolder/g/golgari_germination.txt svneol=native#text/plain
diff --git a/res/cardsfolder/g/golem_skin_gauntlets.txt b/res/cardsfolder/g/golem_skin_gauntlets.txt
new file mode 100644
index 00000000000..dad14c51ff6
--- /dev/null
+++ b/res/cardsfolder/g/golem_skin_gauntlets.txt
@@ -0,0 +1,12 @@
+Name:Golem-Skin Gauntlets
+ManaCost:1
+Types:Artifact Equipment
+Text:no text
+K:eqPump 2:0/0
+S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | Description$ Equipped creature gets +1/+0 for each Equipment attached to it.
+SVar:X:Count$Valid Equipment.AttachedTo Creature.EquippedBy
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/golem_skin_gauntlets.jpg
+SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/181.jpg
+Oracle:Equipped creature gets +1/+0 for each Equipment attached to it.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
+End
\ No newline at end of file
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 01ac10fc1bc..abb3b25ef1c 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -6448,7 +6448,8 @@ public class Card extends GameEntity implements Comparable<Card> {
             }
         } else if (property.startsWith("AttachedTo")) {
             String restriction = property.split("AttachedTo ")[1];
-            if (enchanting == null || !enchanting.isValid(restriction, sourceController, source)) {
+            if ((enchanting == null || !enchanting.isValid(restriction, sourceController, source))
+                    && (equipping.isEmpty() || equipping.get(0).isValid(restriction, sourceController, source))) {
                 return false;
             }
         } else if (property.startsWith("EnchantedBy")) {