diff --git a/.gitattributes b/.gitattributes
index d9fae88d094..f8a0e7b6031 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9085,6 +9085,7 @@ res/cardsfolder/t/thran_golem.txt svneol=native#text/plain
 res/cardsfolder/t/thran_lens.txt svneol=native#text/plain
 res/cardsfolder/t/thran_quarry.txt svneol=native#text/plain
 res/cardsfolder/t/thran_war_machine.txt svneol=native#text/plain
+res/cardsfolder/t/thran_weaponry.txt -text svneol=unset#text/plain
 res/cardsfolder/t/thrashing_mudspawn.txt svneol=native#text/plain
 res/cardsfolder/t/thrashing_wumpus.txt svneol=native#text/plain
 res/cardsfolder/t/thraximundar.txt svneol=native#text/plain
diff --git a/res/cardsfolder/t/thran_weaponry.txt b/res/cardsfolder/t/thran_weaponry.txt
new file mode 100644
index 00000000000..38a1b635db1
--- /dev/null
+++ b/res/cardsfolder/t/thran_weaponry.txt
@@ -0,0 +1,15 @@
+Name:Thran Weaponry
+ManaCost:4
+Types:Artifact
+Text:no text
+K:Echo:4
+K:You may choose not to untap CARDNAME during your untap step.
+A:AB$ Pump | Cost$ 2 T | RememberObjects$ Self | Static$ True
+S:Mode$ Continuous | Affected$ Creature | AddPower$ 2 | AddToughness$ 2 | IsPresent$ Card.Self+tapped | CheckSVar$ SolSauceX | SVarCompare$ EQ1 | Description$ All creatures get +2/+2 for as long as CARDNAME remains tapped.
+T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigClearRemember | Static$ True
+SVar:TrigClearRemember:DB$Cleanup | ClearRemembered$ True
+SVar:SolSauceX:Remembered$Valid Card.Self
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/thran_weaponry.jpg
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
index 296ece4d1d7..9c0659e37e1 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
@@ -935,6 +935,7 @@ public class AbilityFactoryPump {
         final ArrayList<Card> untargetedCards = new ArrayList<Card>();
         final Target tgt = sa.getTarget();
         ArrayList<Player> tgtPlayers = new ArrayList<Player>();
+        String pumpRemembered = null;
         if (tgt != null) {
             tgtCards = tgt.getTargetCards();
             tgtPlayers = tgt.getTargetPlayers();
@@ -947,6 +948,16 @@ public class AbilityFactoryPump {
             }
         }
 
+        if (this.params.containsKey("RememberObjects")) {
+            pumpRemembered = params.get("RememberObjects");
+        }
+
+        if (pumpRemembered != null) {
+            for (final Object o : AbilityFactory.getDefinedObjects(this.hostCard, pumpRemembered, sa)) {
+                this.hostCard.addRemembered(o);
+            }
+        }
+
         if (this.params.containsKey("Radiance")) {
             for (final Card c : CardUtil.getRadiance(this.hostCard, tgtCards.get(0), this.params.get("ValidTgts")
                     .split(","))) {