diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex
index eacc2f06..c17277e7 100644
Binary files a/mpq/arr/portdata.datex and b/mpq/arr/portdata.datex differ
diff --git a/mpq/arr/portdata.tbl b/mpq/arr/portdata.tbl
index 3d8331f8..16f6d999 100644
Binary files a/mpq/arr/portdata.tbl and b/mpq/arr/portdata.tbl differ
diff --git a/mpq/arr/portdata.txt b/mpq/arr/portdata.txt
index 43f2fbee..14778fe3 100644
--- a/mpq/arr/portdata.txt
+++ b/mpq/arr/portdata.txt
@@ -298,8 +298,8 @@ Quazrokor
 Renesair
 Tiangou
 Zealot (Starbound)
-Extended Portrait #191
-Extended Portrait #192
+Maverick (Futurist)
+Maverick (Upstart)
 Extended Portrait #193
 Extended Portrait #194
 Extended Portrait #195
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 345a46ef..1551662d 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/portrait/faction/maverick_futurist/fid00.smk b/mpq/portrait/faction/maverick_futurist/fid00.smk
new file mode 100644
index 00000000..52551556
Binary files /dev/null and b/mpq/portrait/faction/maverick_futurist/fid00.smk differ
diff --git a/mpq/portrait/faction/maverick_futurist/fid01.smk b/mpq/portrait/faction/maverick_futurist/fid01.smk
new file mode 100644
index 00000000..57bcd117
Binary files /dev/null and b/mpq/portrait/faction/maverick_futurist/fid01.smk differ
diff --git a/mpq/portrait/faction/maverick_futurist/fid02.smk b/mpq/portrait/faction/maverick_futurist/fid02.smk
new file mode 100644
index 00000000..2d77e643
Binary files /dev/null and b/mpq/portrait/faction/maverick_futurist/fid02.smk differ
diff --git a/mpq/portrait/faction/maverick_futurist/fid03.smk b/mpq/portrait/faction/maverick_futurist/fid03.smk
new file mode 100644
index 00000000..a42f7f8c
Binary files /dev/null and b/mpq/portrait/faction/maverick_futurist/fid03.smk differ
diff --git a/mpq/portrait/faction/maverick_futurist/tlk00.smk b/mpq/portrait/faction/maverick_futurist/tlk00.smk
new file mode 100644
index 00000000..cdbb187d
Binary files /dev/null and b/mpq/portrait/faction/maverick_futurist/tlk00.smk differ
diff --git a/mpq/portrait/faction/maverick_futurist/tlk01.smk b/mpq/portrait/faction/maverick_futurist/tlk01.smk
new file mode 100644
index 00000000..fa8da3a6
Binary files /dev/null and b/mpq/portrait/faction/maverick_futurist/tlk01.smk differ
diff --git a/mpq/portrait/faction/maverick_futurist/tlk02.smk b/mpq/portrait/faction/maverick_futurist/tlk02.smk
new file mode 100644
index 00000000..b2c5ddb6
Binary files /dev/null and b/mpq/portrait/faction/maverick_futurist/tlk02.smk differ
diff --git a/mpq/portrait/faction/maverick_upstart/fid00.smk b/mpq/portrait/faction/maverick_upstart/fid00.smk
new file mode 100644
index 00000000..2ffc945c
Binary files /dev/null and b/mpq/portrait/faction/maverick_upstart/fid00.smk differ
diff --git a/mpq/portrait/faction/maverick_upstart/fid01.smk b/mpq/portrait/faction/maverick_upstart/fid01.smk
new file mode 100644
index 00000000..3711c038
Binary files /dev/null and b/mpq/portrait/faction/maverick_upstart/fid01.smk differ
diff --git a/mpq/portrait/faction/maverick_upstart/fid02.smk b/mpq/portrait/faction/maverick_upstart/fid02.smk
new file mode 100644
index 00000000..4d189aeb
Binary files /dev/null and b/mpq/portrait/faction/maverick_upstart/fid02.smk differ
diff --git a/mpq/portrait/faction/maverick_upstart/fid03.smk b/mpq/portrait/faction/maverick_upstart/fid03.smk
new file mode 100644
index 00000000..c5147cc9
Binary files /dev/null and b/mpq/portrait/faction/maverick_upstart/fid03.smk differ
diff --git a/mpq/portrait/faction/maverick_upstart/tlk00.smk b/mpq/portrait/faction/maverick_upstart/tlk00.smk
new file mode 100644
index 00000000..d2a4d184
Binary files /dev/null and b/mpq/portrait/faction/maverick_upstart/tlk00.smk differ
diff --git a/mpq/portrait/faction/maverick_upstart/tlk01.smk b/mpq/portrait/faction/maverick_upstart/tlk01.smk
new file mode 100644
index 00000000..a2b1c475
Binary files /dev/null and b/mpq/portrait/faction/maverick_upstart/tlk01.smk differ
diff --git a/mpq/portrait/faction/maverick_upstart/tlk02.smk b/mpq/portrait/faction/maverick_upstart/tlk02.smk
new file mode 100644
index 00000000..e72aef45
Binary files /dev/null and b/mpq/portrait/faction/maverick_upstart/tlk02.smk differ
diff --git a/patchnotes.md b/patchnotes.md
index b8c01b06..ecd58c21 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -51,8 +51,8 @@
 	- Lardfix: Civilian (Blackjack) portrait now plays talking animations (r. lolrsks8s)
 
 ## Audiovisuals
-- New portraits for: (many c. jun3hong)
-	- **TERRAN:** Arhaun, Blackguard, Blackjack (Golden), Cleric (Futurist), Cyclops (Futurist), Harakan (Golden), Qilin, Tiangou
+- New portraits for: (many c. jun3hong, some c. lolrsk8s)
+	- **TERRAN:** Maverick (Futurist & Upstart), Arhaun, Blackguard, Blackjack (Golden), Cleric (Futurist), Cyclops (Futurist), Harakan (Golden), Qilin, Tiangou
 	- **PROTOSS:** Cicatus, Dracadin (Order), Ecclesiast (Khalendric), Extatus, Manifold (Starbound), Renesair, Zealot (Starbound)
 	- **ZERG:** Quazrokor
 - New cast SFX for **Seraph Irradiate**
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 13867b9a..10b47e4d 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ