diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
index 9558d9d46a81f..d6485c8ea969f 100644
--- a/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
+++ b/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
@@ -185,7 +185,7 @@
         {MODIFY_UNIT id=Eldred hitpoints 1}
 
         [move_unit_fake]
-            type=$delfador_store.type
+            type=Elder Mage
             x=25,24,24
             y=18,17,16
         [/move_unit_fake]
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
index ed3e1cd6de957..14dbaedf47655 100644
--- a/data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
+++ b/data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
@@ -42,7 +42,7 @@
     #### Delfador's code ####
     #wmllint: validate-off
     [side]
-        {YOUNG_DELFADOR}
+        {OLD_DELFADOR}
         side=1
         save_id=Player
         persistent=yes
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
index 7cf9cc51a9120..84f78ceb82ff7 100644
--- a/data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
+++ b/data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
@@ -25,7 +25,7 @@
 
     #wmllint: validate-off
     [side]
-        {YOUNG_DELFADOR}
+        {OLD_DELFADOR}
         side=1
         save_id=Player
         persistent=yes
diff --git a/data/campaigns/Delfadors_Memoirs/units/Journeyman_Mage.cfg b/data/campaigns/Delfadors_Memoirs/units/Journeyman_Mage.cfg
index aec56e6c2107f..39e21b16886e4 100644
--- a/data/campaigns/Delfadors_Memoirs/units/Journeyman_Mage.cfg
+++ b/data/campaigns/Delfadors_Memoirs/units/Journeyman_Mage.cfg
@@ -5,7 +5,6 @@
     [/base_unit]
     id=Journeyman Mage
     name=_"Journeyman Mage"
-    #    profile="portraits/young_delfador.png"
     movement=6			# To "travel far", or at least a little faster
     alignment=neutral		# Rather than lawful
     cost=25			# A little more expensive
diff --git a/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg b/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg
index c37f69453f8f2..38c06e5ba1289 100644
--- a/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg
+++ b/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg
@@ -14,7 +14,6 @@
         fire=60			# Add fire resistance
     [/resistance]
     movement=6			# A little faster
-    #    advances_to=Elder Mage
     cost=125			# Rather more expensive
     description=_"A Mage Magister, though equivalent in degree to a Great Mage, has special abilities of command and healing derived from extensive experience of battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_HEALS}
     [attack]
diff --git a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
index 7f87fc04bcbc6..e829cb9ea4c3e 100644
--- a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
+++ b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
@@ -27,14 +27,27 @@
             [effect]
                 apply_to=profile
                 [filter]
-                    type=Elder Mage
+                    type=Mage Commander,Mage Magister
                 [/filter]
-                portrait=portraits/old_delfador.png
+                portrait=portraits/young_delfador.png
             [/effect]
         [/object]
     [/modifications]
 #enddef
 
+#define OLD_DELFADOR
+    id=Delfador
+    name= _"Delfador"
+    type=Elder Mage
+    profile="portraits/old_delfador.png"
+    canrecruit=yes
+    unrenamable=yes
+    [modifications]
+        {TRAIT_RESILIENT}
+        {TRAIT_INTELLIGENT}
+    [/modifications]
+#enddef
+
 #define CHANTAL
     type=Elvish Druid
     id=Chantal
diff --git a/data/campaigns/Delfadors_Memoirs/utils/sides.cfg b/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
index d553114df4b59..3876b066dbd43 100644
--- a/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
+++ b/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
@@ -628,28 +628,18 @@
 # At the end of Prince of Wesnoth (20), Delfador intervenes.
 
 #define DELFADOR_ARRIVES X Y
-    [unstore_unit]
-        variable=delfador_store
-        find_vacant=yes
-        x,y={X},{Y}
-    [/unstore_unit]
     {CLEAR_VARIABLE delfador_store}
-    [modify_unit]
-        [filter]
-            id=Delfador
-        [/filter]
-        type=""
-    [/modify_unit]
-    [heal_unit]
-        [filter]
-            id=Delfador
-        [/filter]
-        amount=full
-        animate=no
-        moves=full
-        restore_attacks=yes
-        restore_statuses=yes
-    [/heal_unit]
+    # recreate Delfador as he is now 54, 26 years older than last time.
+    [unit]
+        {OLD_DELFADOR}
+        x,y={X},{Y}
+        placement=map
+        passable=yes
+        overwrite=no
+        facing=ne
+        side=1
+    [/unit]
+    # clears any fog around his appearance
     [redraw]
         side=1
     [/redraw]