diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04afed8d6..4d1e12589 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,11 @@
 
 ## [master] (https://github.com/WagicProject/wagic/tree/master)
 
+### 06/10/21
+- *Committed:* Fixed primitive "Armament Master" (issue #1075 opened by @remigiusz-suwalski). ([Vitty85](https://github.com/Vitty85))
+
 ### 01/10/21
-- *Committed:* Added "--no-check-certificate" option to download the PSP SDK. ([Vitty85](https://github.com/Vitty85))
+- *Committed:* Added "--no-check-certificate" option to download the PSP SDK. https://github.com/WagicProject/wagic/commit/b84745e063baf669aaa085ed9c8bcdd9c943649a ([Vitty85](https://github.com/Vitty85))
 
 - *Committed:* Added/fixed primitives, updated the "missing_cards_by_sets" folder. https://github.com/WagicProject/wagic/commit/89024241a874102cebb9a5c8b0c764973171c2eb ([Vitty85](https://github.com/Vitty85))
 
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index b5653b6bf..533cead41 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -5771,7 +5771,26 @@ toughness=4
 [/card]
 [card]
 name=Armament Master
-auto=thisforeach(gear) lord(other creature[kor]|myBattlefield) 2/2
+auto=this(gear = 1) lord(other creature[kor]|myBattlefield) 2/2
+auto=this(gear = 2) lord(other creature[kor]|myBattlefield) 4/4
+auto=this(gear = 3) lord(other creature[kor]|myBattlefield) 6/6
+auto=this(gear = 4) lord(other creature[kor]|myBattlefield) 8/8
+auto=this(gear = 5) lord(other creature[kor]|myBattlefield) 10/10
+auto=this(gear = 6) lord(other creature[kor]|myBattlefield) 12/12
+auto=this(gear = 7) lord(other creature[kor]|myBattlefield) 14/14
+auto=this(gear = 8) lord(other creature[kor]|myBattlefield) 16/16
+auto=this(gear = 9) lord(other creature[kor]|myBattlefield) 18/18
+auto=this(gear = 10) lord(other creature[kor]|myBattlefield) 20/20
+auto=this(gear = 11) lord(other creature[kor]|myBattlefield) 22/22
+auto=this(gear = 12) lord(other creature[kor]|myBattlefield) 24/24
+auto=this(gear = 13) lord(other creature[kor]|myBattlefield) 26/26
+auto=this(gear = 14) lord(other creature[kor]|myBattlefield) 28/28
+auto=this(gear = 15) lord(other creature[kor]|myBattlefield) 30/30
+auto=this(gear = 16) lord(other creature[kor]|myBattlefield) 32/32
+auto=this(gear = 17) lord(other creature[kor]|myBattlefield) 34/34
+auto=this(gear = 18) lord(other creature[kor]|myBattlefield) 36/36
+auto=this(gear = 19) lord(other creature[kor]|myBattlefield) 38/38
+auto=this(gear >= 20) lord(other creature[kor]|myBattlefield) 40/40
 text=Other Kor creatures you control get +2/+2 for each Equipment attached to Armament Master.
 mana={W}{W}
 type=Creature