diff --git a/.gitattributes b/.gitattributes
index 0e004ba12ad..e091d7e4bfb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -574,6 +574,7 @@ res/cardsfolder/a/auriok_edgewright.txt svneol=native#text/plain
 res/cardsfolder/a/auriok_glaivemaster.txt svneol=native#text/plain
 res/cardsfolder/a/auriok_replica.txt -text
 res/cardsfolder/a/auriok_salvagers.txt svneol=native#text/plain
+res/cardsfolder/a/auriok_steelshaper.txt -text
 res/cardsfolder/a/auriok_sunchaser.txt svneol=native#text/plain
 res/cardsfolder/a/auriok_survivors.txt -text
 res/cardsfolder/a/auriok_transfixer.txt svneol=native#text/plain
diff --git a/res/cardsfolder/a/auriok_steelshaper.txt b/res/cardsfolder/a/auriok_steelshaper.txt
new file mode 100644
index 00000000000..ac851730478
--- /dev/null
+++ b/res/cardsfolder/a/auriok_steelshaper.txt
@@ -0,0 +1,16 @@
+Name:Auriok Steelshaper
+ManaCost:1 W
+Types:Creature Human Soldier
+Text:no text
+PT:1/1
+S:Mode$ ReduceCost | ValidCard$ Card | Type$ Equip | Activator$ You | Amount$ 1 | Description$ Equip costs you pay cost 1 less.
+S:Mode$ Continuous | Affected$ Creature.Soldier+YouCtrl,Creature.Knight+YouCtrl | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ EQ1 | References$ X | Description$ As long as CARDNAME is equipped, Soldier and/or Knight creatures you control get +1/+1.
+SVar:X:Count$Valid Card.Self+equipped
+SVar:EquipMe:Once
+SVar:RemRandomDeck:True
+DeckNeeds:Type$Equipment
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_steelshaper.jpg
+SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/4.jpg
+Oracle:Equip costs you pay cost {1} less.\nAs long as Auriok Steelshaper is equipped, Soldier and/or Knight creatures you control get +1/+1.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/staticability/StaticAbilityCostChange.java b/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
index 864a7a091da..142bbb81e66 100644
--- a/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
+++ b/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
@@ -194,6 +194,9 @@ public class StaticAbilityCostChange {
             }
             if (params.get("Type").equals("Cycling") && !sa.isCycling()) {
                 return originalCost;
+            } else if (params.get("Type").equals("Equip")
+                    && (!(sa instanceof AbilityActivated) || !sa.hasParam("Equip"))) {
+                return originalCost;
             }
         }
         if (params.containsKey("ValidTarget")) {