diff --git a/gamedir/Data-1.13/Skills_Settings.INI b/gamedir/Data-1.13/Skills_Settings.INI
index be291b4ba..33dbddfeb 100644
--- a/gamedir/Data-1.13/Skills_Settings.INI
+++ b/gamedir/Data-1.13/Skills_Settings.INI
@@ -25,10 +25,12 @@ MAX_NUMBER_OF_TRAITS = 3
 ; Values from 2 to 20 are allowed.
 NUMBER_OF_MAJOR_TRAITS_ALLOWED = 2
 
+; Allow special merc to have one more major trait?
+ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
 
-; Allow Dr.Q to have one more trait? (giving him Martial Arts + Paramedic + Night Ops)
-ALLOW_EXCEPTION_FOR_DR_Q = TRUE
-
+; Assign the Merc ID to have one more major trait, only applies if ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
+; Values from 0 to 254 are allowed, does not work on IMPs. (Default: 33, giving Dr Q. Martial Arts + Night Ops + Paramedic)
+SPECIAL_MERC_ID = 33
 
 ; Do traits set minimum attributes when selected?
 SET_MINIMUM_ATTRIBUTES_FOR_TRAITS = TRUE
diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml
index b837ef8bf..596c82229 100644
--- a/gamedir/Data-1.13/TableData/MercProfiles.xml
+++ b/gamedir/Data-1.13/TableData/MercProfiles.xml
@@ -2910,8 +2910,8 @@
 		<bOldSkillTrait2>4</bOldSkillTrait2>
 		<bNewSkillTrait1>6</bNewSkillTrait1>
 		<bNewSkillTrait2>6</bNewSkillTrait2>
-		<bNewSkillTrait3>9</bNewSkillTrait3>
-		<bNewSkillTrait4>13</bNewSkillTrait4>
+		<bNewSkillTrait3>13</bNewSkillTrait3>
+		<bNewSkillTrait4>9</bNewSkillTrait4>
 		<bBuddy1>255</bBuddy1>
 		<bBuddy2>255</bBuddy2>
 		<bBuddy3>255</bBuddy3>
diff --git a/gamedir/Data-UB/Skills_Settings.INI b/gamedir/Data-UB/Skills_Settings.INI
index cd2df4888..26e275daf 100644
--- a/gamedir/Data-UB/Skills_Settings.INI
+++ b/gamedir/Data-UB/Skills_Settings.INI
@@ -25,10 +25,12 @@ MAX_NUMBER_OF_TRAITS = 3
 ; Values from 2 to 20 are allowed.
 NUMBER_OF_MAJOR_TRAITS_ALLOWED = 2
 
+; Allow special merc to have one more major trait?
+ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
 
-; Allow Dr.Q to have one more trait? (giving him Martial Arts + Paramedic + Night Ops)
-ALLOW_EXCEPTION_FOR_DR_Q = TRUE
-
+; Assign the Merc ID to have one more major trait, only applies if ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
+; Values from 0 to 254 are allowed, does not work on IMPs. (Default: 33, giving Dr Q. Martial Arts + Night Ops + Paramedic)
+SPECIAL_MERC_ID = 33
 
 ; Do traits set minimum attributes when selected?
 SET_MINIMUM_ATTRIBUTES_FOR_TRAITS = TRUE
diff --git a/gamedir/Data/Skills_Settings.INI b/gamedir/Data/Skills_Settings.INI
index 86e494396..1931a8de0 100644
--- a/gamedir/Data/Skills_Settings.INI
+++ b/gamedir/Data/Skills_Settings.INI
@@ -25,10 +25,12 @@ MAX_NUMBER_OF_TRAITS = 3
 ; Values from 2 to 20 are allowed.
 NUMBER_OF_MAJOR_TRAITS_ALLOWED = 2
 
+; Allow special merc to have one more major trait?
+ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
 
-; Allow Dr.Q to have one more trait? (giving him Martial Arts + Paramedic + Night Ops)
-ALLOW_EXCEPTION_FOR_DR_Q = TRUE
-
+; Assign the Merc ID to have one more major trait, only applies if ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
+; Values from 0 to 254 are allowed, does not work on IMPs. (Default: 33, giving Dr Q. Martial Arts + Night Ops + Paramedic)
+SPECIAL_MERC_ID = 33
 
 ; Do traits set minimum attributes when selected?
 SET_MINIMUM_ATTRIBUTES_FOR_TRAITS = TRUE