diff --git a/episode1/scenarios/12_The_Queen.cfg b/episode1/scenarios/12_The_Queen.cfg
index 5a161149..d5230d8a 100644
--- a/episode1/scenarios/12_The_Queen.cfg
+++ b/episode1/scenarios/12_The_Queen.cfg
@@ -227,6 +227,9 @@
     [or]
         race=elf
     [/or]
+    [or]
+        race=quenoth
+    [/or]
     [not]
         id=Elynia
     [/not]
diff --git a/episode3/scenarios/04_01_Outpost_of_Hell.cfg b/episode3/scenarios/04_01_Outpost_of_Hell.cfg
index 3a94b2b2..6703f230 100644
--- a/episode3/scenarios/04_01_Outpost_of_Hell.cfg
+++ b/episode3/scenarios/04_01_Outpost_of_Hell.cfg
@@ -1490,6 +1490,9 @@ In any case, you are not so stupid as to attempt such a pointless move now.")}
                         [not]
                             race=elf
                         [/not]
+                        [not]
+                            race=quenoth
+                        [/not]
                         [not]
                             race=orc
                         [/not]
@@ -1617,7 +1620,7 @@ In any case, you are not so stupid as to attempt such a pointless move now.")}
 
                 [message]
                     side=$random
-                    race=human,orc,wolf,goblin,faerie,elf
+                    race=human,orc,wolf,goblin,faerie,elf,quenoth
                     message= _ "Fire in the hole!"
                     scroll=no
                     [show_if]
diff --git a/units/elves-quenoth.cfg b/units/elves-quenoth.cfg
index 8d8bca37..a6df3f9f 100644
--- a/units/elves-quenoth.cfg
+++ b/units/elves-quenoth.cfg
@@ -9,6 +9,19 @@
 # while their sand defense is 10% less down to a minimum of 50%
 #
 
+[race]
+    id=quenoth
+    help_taxonomy=elf
+    male_name= _ "race^Quenoth Elf"
+    female_name= _ "race+female^Quenoth Elf"
+    plural_name= _ "race^Quenoth Elves"
+    description= _"Although more adapted to the sands than the elves of the Great Continent in the days of Wesnoth or those of the Elynia's valley, the Quenoth elves began to readapt to the rainforest of their island, and began to lose their adaptation to desert environment."
+    num_traits=2
+    markov_chain_size=2
+    {ELVISH_NAMES}
+    {TRAIT_DEXTROUS}
+[/race]
+
 [movetype]
     name=quenoth_foot
     [movement_costs]
diff --git a/units/elves-quenoth/Archer.cfg b/units/elves-quenoth/Archer.cfg
index 127b44ed..c5c7740f 100644
--- a/units/elves-quenoth/Archer.cfg
+++ b/units/elves-quenoth/Archer.cfg
@@ -5,7 +5,7 @@
     name= _ "Quenoth Archer"
     image=units/elves-quenoth/archer.png
     profile="portraits/quenoth/archer.png"
-    race=elf
+    race=quenoth
     hitpoints=40
     movement_type=quenoth_horse
     [resistance]
diff --git a/units/elves-quenoth/Champion.cfg b/units/elves-quenoth/Champion.cfg
index 93e15580..6a03eb0c 100644
--- a/units/elves-quenoth/Champion.cfg
+++ b/units/elves-quenoth/Champion.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Champion
     name= _ "Quenoth Champion"
-    race=elf
+    race=quenoth
     ignore_race_traits=yes
     {TRAIT_STRONG}
     {TRAIT_QUICK}
diff --git a/units/elves-quenoth/Druid.cfg b/units/elves-quenoth/Druid.cfg
index b4f716a1..845059e2 100644
--- a/units/elves-quenoth/Druid.cfg
+++ b/units/elves-quenoth/Druid.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Druid
     name= _ "female^Quenoth Druid"
-    race=elf
+    race=quenoth
     gender=female
     image=units/elves-quenoth/druid.png
     profile="portraits/quenoth/druid.png"
diff --git a/units/elves-quenoth/Fighter.cfg b/units/elves-quenoth/Fighter.cfg
index 34616f1e..5ef37804 100644
--- a/units/elves-quenoth/Fighter.cfg
+++ b/units/elves-quenoth/Fighter.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Fighter
     name= _ "Quenoth Fighter"
-    race=elf
+    race=quenoth
     ignore_race_traits=yes
     {TRAIT_STRONG}
     {TRAIT_QUICK}
diff --git a/units/elves-quenoth/Flagbearer.cfg b/units/elves-quenoth/Flagbearer.cfg
index c05429d1..c0e977ff 100644
--- a/units/elves-quenoth/Flagbearer.cfg
+++ b/units/elves-quenoth/Flagbearer.cfg
@@ -6,7 +6,7 @@
     image=units/elves-quenoth/flagbearer.png
     image_icon="units/elves-quenoth/flagbearer.png~CROP(0,0,72,72)"
     profile="portraits/quenoth/tauroch_flagbearer.png"
-    race=elf
+    race=quenoth
     # Base movement of 4 is too little, but we don't want them to get 6 either
     # if they're quick, so instead they just have 5 movement but can't get quick
     ignore_race_traits=yes
diff --git a/units/elves-quenoth/Flanker.cfg b/units/elves-quenoth/Flanker.cfg
index a6c7623a..1172737e 100644
--- a/units/elves-quenoth/Flanker.cfg
+++ b/units/elves-quenoth/Flanker.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Flanker
     name= _ "Quenoth Flanker"
-    race=elf
+    race=quenoth
     ignore_race_traits=yes
     {TRAIT_STRONG}
     {TRAIT_QUICK}
diff --git a/units/elves-quenoth/Marksman.cfg b/units/elves-quenoth/Marksman.cfg
index 2d3fed88..7e056d2f 100644
--- a/units/elves-quenoth/Marksman.cfg
+++ b/units/elves-quenoth/Marksman.cfg
@@ -5,7 +5,7 @@
     name= _ "Quenoth Marksman"
     image=units/elves-quenoth/marksman.png
     profile="portraits/quenoth/marksman.png"
-    race=elf
+    race=quenoth
     hitpoints=52
     movement_type=quenoth_horse
     [resistance]
diff --git a/units/elves-quenoth/Mystic.cfg b/units/elves-quenoth/Mystic.cfg
index 3c2abe54..c47defb7 100644
--- a/units/elves-quenoth/Mystic.cfg
+++ b/units/elves-quenoth/Mystic.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Mystic
     name= _ "female^Quenoth Mystic"
-    race=elf
+    race=quenoth
     gender=female
     image=units/elves-quenoth/mystic/mystic.png
     profile="portraits/quenoth/mystic.png"
diff --git a/units/elves-quenoth/Outrider.cfg b/units/elves-quenoth/Outrider.cfg
index 17b5b9ae..d3d6f87a 100644
--- a/units/elves-quenoth/Outrider.cfg
+++ b/units/elves-quenoth/Outrider.cfg
@@ -5,7 +5,7 @@
     name= _ "Quenoth Outrider"
     image=units/elves-quenoth/outrider.png
     profile="portraits/quenoth/outrider.png"
-    race=elf
+    race=quenoth
     hitpoints=55
     movement_type=quenoth_horse
     [resistance]
diff --git a/units/elves-quenoth/Pathfinder.cfg b/units/elves-quenoth/Pathfinder.cfg
index c914f846..6ac609cd 100644
--- a/units/elves-quenoth/Pathfinder.cfg
+++ b/units/elves-quenoth/Pathfinder.cfg
@@ -5,7 +5,7 @@
     name= _ "Quenoth Pathfinder"
     image=units/elves-quenoth/pathfinder.png
     profile="portraits/quenoth/pathfinder.png"
-    race=elf
+    race=quenoth
     hitpoints=42
     movement_type=quenoth_horse
     [resistance]
diff --git a/units/elves-quenoth/Protector.cfg b/units/elves-quenoth/Protector.cfg
index 5dd72b06..d4f37683 100644
--- a/units/elves-quenoth/Protector.cfg
+++ b/units/elves-quenoth/Protector.cfg
@@ -6,7 +6,7 @@
     image=units/elves-quenoth/protector.png
     image_icon="units/elves-quenoth/protector.png~CROP(0,0,72,72)"
     profile="portraits/quenoth/tauroch_protector.png"
-    race=elf
+    race=quenoth
     # Base movement of 4 is too little, but we don't want them to get 6 either
     # if they're quick, so instead they just have 5 movement but can't get quick
     ignore_race_traits=yes
diff --git a/units/elves-quenoth/Ranger.cfg b/units/elves-quenoth/Ranger.cfg
index 68a2fc11..d13580d0 100644
--- a/units/elves-quenoth/Ranger.cfg
+++ b/units/elves-quenoth/Ranger.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Ranger
     name= _ "Quenoth Ranger"
-    race=elf
+    race=quenoth
     ignore_race_traits=yes
     {TRAIT_STRONG}
     {TRAIT_QUICK}
diff --git a/units/elves-quenoth/Rider.cfg b/units/elves-quenoth/Rider.cfg
index f76f5287..0ed69731 100644
--- a/units/elves-quenoth/Rider.cfg
+++ b/units/elves-quenoth/Rider.cfg
@@ -6,7 +6,7 @@
     image=units/elves-quenoth/rider.png
     image_icon="units/elves-quenoth/rider.png~CROP(0,0,72,72)"
     profile="portraits/quenoth/tauroch_rider.png"
-    race=elf
+    race=quenoth
     # Base movement of 4 is too little, but we don't want them to get 6 either
     # if they're quick, so instead they just have 5 movement but can't get quick
     ignore_race_traits=yes
diff --git a/units/elves-quenoth/Scout.cfg b/units/elves-quenoth/Scout.cfg
index 3d33c669..9a35239d 100644
--- a/units/elves-quenoth/Scout.cfg
+++ b/units/elves-quenoth/Scout.cfg
@@ -5,7 +5,7 @@
     name= _ "Quenoth Scout"
     image=units/elves-quenoth/scout.png
     profile="portraits/quenoth/scout.png"
-    race=elf
+    race=quenoth
     hitpoints=29
     movement_type=quenoth_horse
     movement=8
diff --git a/units/elves-quenoth/Shaman.cfg b/units/elves-quenoth/Shaman.cfg
index 52d4a83e..b11a0a46 100644
--- a/units/elves-quenoth/Shaman.cfg
+++ b/units/elves-quenoth/Shaman.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Shaman
     name= _ "female^Quenoth Shaman"
-    race=elf
+    race=quenoth
     gender=female
     image=units/elves-quenoth/shaman.png
     profile="portraits/quenoth/shaman.png"
diff --git a/units/elves-quenoth/Shyde.cfg b/units/elves-quenoth/Shyde.cfg
index ec206eb2..db8f959d 100644
--- a/units/elves-quenoth/Shyde.cfg
+++ b/units/elves-quenoth/Shyde.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Shyde
     name= _ "female^Quenoth Shyde"
-    race=elf
+    race=quenoth
     gender=female
     image=units/elves-quenoth/shyde.png
     profile="portraits/quenoth/shyde.png"
diff --git a/units/elves-quenoth/Stalwart.cfg b/units/elves-quenoth/Stalwart.cfg
index 1af84f9c..1396f417 100644
--- a/units/elves-quenoth/Stalwart.cfg
+++ b/units/elves-quenoth/Stalwart.cfg
@@ -6,7 +6,7 @@
     image=units/elves-quenoth/stalwart.png
     image_icon="units/elves-quenoth/stalwart.png~CROP(0,0,72,72)"
     profile="portraits/quenoth/tauroch_stalwart.png"
-    race=elf
+    race=quenoth
     # Base movement of 4 is too little, but we don't want them to get 6 either
     # if they're quick, so instead they just have 5 movement but can't get quick
     ignore_race_traits=yes
diff --git a/units/elves-quenoth/Sun_Singer.cfg b/units/elves-quenoth/Sun_Singer.cfg
index 557c488e..8503f83f 100644
--- a/units/elves-quenoth/Sun_Singer.cfg
+++ b/units/elves-quenoth/Sun_Singer.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Sun Singer
     name= _ "female^Quenoth Sun Singer"
-    race=elf
+    race=quenoth
     gender=female
     image=units/elves-quenoth/sun_singer/sun-singer.png
     profile="portraits/quenoth/sun_singer.png"
diff --git a/units/elves-quenoth/Sun_Sylph.cfg b/units/elves-quenoth/Sun_Sylph.cfg
index da87874b..0771cd39 100644
--- a/units/elves-quenoth/Sun_Sylph.cfg
+++ b/units/elves-quenoth/Sun_Sylph.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Sun Sylph
     name= _ "female^Quenoth Sun Sylph"
-    race=elf
+    race=quenoth
     gender=female
     image=units/elves-quenoth/sun_sylph/sun-sylph.png
     profile="portraits/quenoth/sun_sylph.png"
diff --git a/units/elves-quenoth/Vanguard.cfg b/units/elves-quenoth/Vanguard.cfg
index 85ed9f47..37196054 100644
--- a/units/elves-quenoth/Vanguard.cfg
+++ b/units/elves-quenoth/Vanguard.cfg
@@ -6,7 +6,7 @@
     image=units/elves-quenoth/vanguard.png
     image_icon="units/elves-quenoth/vanguard.png~CROP(0,0,72,72)"
     profile="portraits/quenoth/tauroch_vanguard.png"
-    race=elf
+    race=quenoth
     # Base movement of 4 is too little, but we don't want them to get 6 either
     # if they're quick, so instead they just have 5 movement but can't get quick
     ignore_race_traits=yes
diff --git a/units/elves-quenoth/Warrior.cfg b/units/elves-quenoth/Warrior.cfg
index a29b56f6..e5ee78f4 100644
--- a/units/elves-quenoth/Warrior.cfg
+++ b/units/elves-quenoth/Warrior.cfg
@@ -3,7 +3,7 @@
 [unit_type]
     id=Quenoth Warrior
     name= _ "Quenoth Warrior"
-    race=elf
+    race=quenoth
     ignore_race_traits=yes
     {TRAIT_STRONG}
     {TRAIT_QUICK}