diff --git a/res/cardsfolder/p/preeminent_captain.txt b/res/cardsfolder/p/preeminent_captain.txt
index 7263101c5a2..b14eaba1160 100644
--- a/res/cardsfolder/p/preeminent_captain.txt
+++ b/res/cardsfolder/p/preeminent_captain.txt
@@ -1,9 +1,11 @@
 Name:Preeminent Captain
 ManaCost:2 W
 Types:Creature Kithkin Soldier
-Text:Whenever CARDNAME attacks, you may put a Soldier creature card from your hand onto the battlefield tapped and attacking.
+Text:no text
 PT:2/2
 K:First Strike
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may put a Soldier creature card from your hand onto the battlefield tapped and attacking.
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Soldier+YouCtrl | Tapped$ True | Attacking$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/preeminent_captain.jpg
 SetInfo:MOR|Rare|http://magiccards.info/scans/en/mt/20.jpg
diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java
index 685ccbaefb3..e3ca9a1bada 100644
--- a/src/main/java/forge/CombatUtil.java
+++ b/src/main/java/forge/CombatUtil.java
@@ -2257,7 +2257,7 @@ public class CombatUtil {
 
         } // Witch-Maw Nephilim
 
-        else if (c.getName().equals("Preeminent Captain") && !c.getCreatureAttackedThisCombat()) {
+        /*else if (c.getName().equals("Preeminent Captain") && !c.getCreatureAttackedThisCombat()) {
             System.out.println("Preeminent Captain Attacks");
 
             CardList soldiers = c.getController().getCardsIn(Zone.Hand);
@@ -2288,7 +2288,7 @@ public class CombatUtil {
                 }
 
             } // if (creatures.size() > 0)
-        } // Preeminent Captain
+        }*/ // Preeminent Captain
 
         else if (c.getName().equals("Sapling of Colfenor") && !c.getCreatureAttackedThisCombat()) {
             Player player = c.getController();
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
index b2943fb66da..d5bfdaacb63 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
@@ -834,6 +834,10 @@ public final class AbilityFactory_ChangeZone {
                     if (params.containsKey("GainControl")) {
                         c.addController(af.getHostCard());
                     }
+                    
+                    if (params.containsKey("Attacking")) {
+                        AllZone.getCombat().addAttacker(c);
+                    }
 
                     movedCard = AllZone.getGameAction().moveTo(c.getController().getZone(destination), c);
                 } else {
@@ -987,6 +991,10 @@ public final class AbilityFactory_ChangeZone {
                 if (params.containsKey("GainControl")) {
                     c.addController(af.getHostCard());
                 }
+                
+                if (params.containsKey("Attacking")) {
+                    AllZone.getCombat().addAttacker(c);
+                }
                 // Auras without Candidates stay in their current location
                 if (c.isAura()) {
                     final SpellAbility saAura = AbilityFactory_Attach.getAttachSpellAbility(c);