diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
index 9e5bdeae16a..9fe582a0eff 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -1458,6 +1458,12 @@ public class CardProperty {
             if (property.equals("attacking"))    return combat.isAttacking(card);
             if (property.equals("attackingLKI")) return combat.isLKIAttacking(card);
             if (property.equals("attackingYou")) return combat.isAttacking(card, sourceController);
+            if (property.equals("attackingSame")) {
+                final GameEntity attacked = combat.getDefenderByAttacker(source);
+                if (!combat.isAttacking(card, attacked)) {
+                    return false;
+                }
+            }
             if (property.equals("attackingYouOrYourPW")) {
                 Player defender = combat.getDefenderPlayerByAttacker(card);
                 if (!sourceController.equals(defender)) {
diff --git a/forge-gui/res/cardsfolder/upcoming/kitesail_skirmisher.txt b/forge-gui/res/cardsfolder/upcoming/kitesail_skirmisher.txt
new file mode 100644
index 00000000000..876cb946689
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/kitesail_skirmisher.txt
@@ -0,0 +1,11 @@
+Name:Kitesail Skirmisher
+ManaCost:3 U
+Types:Creature Human Pirate
+PT:3/1
+K:Flying
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature attacking the same player or planeswalker gains flying until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other+attackingSame | TgtPrompt$ Choose another target creature attacking the same player or planeswalker | KW$ Flying
+K:Encore:4 U
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Token
+Oracle:Flying\nWhenever Kitesail Skirmisher attacks, another target creature attacking the same player or planeswalker gains flying until end of turn.\nEncore {4}{U} ({4}{U}, Exile this card from your graveyard: For each opponent, create a token copy that attacks that opponent this turn if able. They gain haste. Sacrifice them at the beginning of the next end step. Activate only as a sorcery.)