diff --git a/.gitattributes b/.gitattributes
index bf51afa626c..44d572bf3d2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -16744,6 +16744,7 @@ forge-gui/res/cardsfolder/upcoming/censor.txt -text
 forge-gui/res/cardsfolder/upcoming/champion_of_rhonas.txt -text
 forge-gui/res/cardsfolder/upcoming/channeler_initiate.txt -text
 forge-gui/res/cardsfolder/upcoming/colossapede.txt -text
+forge-gui/res/cardsfolder/upcoming/combat_celebrant.txt -text
 forge-gui/res/cardsfolder/upcoming/commit_memory.txt -text
 forge-gui/res/cardsfolder/upcoming/companion_of_the_trials.txt -text
 forge-gui/res/cardsfolder/upcoming/compelling_argument.txt -text
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 2ce10e3268f..e419c358763 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -4945,6 +4945,10 @@ public class Card extends GameEntity implements Comparable<Card> {
             if (!getDamageHistory().getCreatureBlockedThisTurn()) {
                 return false;
             }
+        } else if (property.startsWith("notExertedThisTurn")) {
+            if (getExertedThisTurn() > 0) {
+                return false;
+            }
         } else if (property.startsWith("gotBlockedThisTurn")) {
             if (!getDamageHistory().getCreatureGotBlockedThisTurn()) {
                 return false;
diff --git a/forge-gui/res/cardsfolder/upcoming/combat_celebrant.txt b/forge-gui/res/cardsfolder/upcoming/combat_celebrant.txt
new file mode 100644
index 00000000000..89886099dd0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/combat_celebrant.txt
@@ -0,0 +1,9 @@
+Name:Combat Celebrant
+ManaCost:2 R
+Types:Creature Human Warrior
+PT:4/1
+S:Mode$ Continuous | Affected$ Creature.Self+notExertedThisTurn | AddKeyword$ You may exert CARDNAME as it attacks. | Description$ If CARDNAME hasn't been exerted this turn, you may exert it as it attacks.
+T:Mode$ Exerted | ValidCard$ Card.Self | Execute$ TrigUntapAll | TriggerDescription$ When you exert CARDNAME, untap all other creatures you control and after this phase, there is an additional combat phase.
+SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl+Other | SubAbility$ DBAddCombat
+SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ BeginCombat | AfterPhase$ EndCombat
+Oracle:If Combat Celebrant hasn't been exerted this turn, you may exert it as it attacks. When you do, untap all other creatures you control and after this phase, there is an additional combat phase. (An exerted creature won't untap during your next untap step.)
\ No newline at end of file