diff --git a/data/units/Deathmaster.cfg b/data/units/Deathmaster.cfg
index d410fcd6424..7d8f366b57e 100644
--- a/data/units/Deathmaster.cfg
+++ b/data/units/Deathmaster.cfg
@@ -1,8 +1,8 @@
 [unit]
 name=Deathmaster
 race=undead
-image=undead-necromancer.png
-image_defensive=undead-necromancer-defend.png
+image=undead-deathmaster.png
+image_defensive=undead-deathmaster-defend.png
 hitpoints=60
 movement_type=undeadfoot
 movement=5
@@ -23,7 +23,7 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-100
 		end=100
-		image=undead-necromancer-attack.png
+		image=undead-deathmaster-attack.png
 		[/frame]
 		[sound]
 		time=-100
@@ -40,11 +40,33 @@ get_hit_sound=groan.wav
 	icon=attacks/dark-missile.png
 		[frame]
 		begin=-300
-		end=-200
-		image=undead-necromancer-attack2.png
+		end=-250
+		image=undead-deathmaster-ranged1.png
 		[/frame]
 		[missile_frame]
+		[frame]
+		begin=-250
+		end=-200
+		image=undead-deathmaster-ranged2.png
+		[/frame]
+		[missile_frame]
+		[frame]
 		begin=-200
+		end=-150
+		image=undead-deathmaster-ranged3.png
+		[/frame]
+		[frame]
+		begin=-150
+		end=-100
+		image=undead-deathmaster-ranged4.png
+		[/frame]
+		[frame]
+		begin=-100
+		end=50
+		image=undead-deathmaster-ranged1.png
+		[/frame]
+		[missile_frame]
+		begin=-150
 		end=0
 		image=projectiles/darkmissile-n.png
 		image_diagonal=projectiles/darkmissile-ne.png
diff --git a/data/units/Demilich.cfg b/data/units/Demilich.cfg
index 31a5c25468f..3eec790ed60 100644
--- a/data/units/Demilich.cfg
+++ b/data/units/Demilich.cfg
@@ -1,7 +1,7 @@
 [unit]
 name=Demilich
 race=undead
-image=undead-lich.png
+image=undead-demilich.png
 hitpoints=80
 movement_type=undeadfoot
 movement=6
@@ -20,6 +20,11 @@ get_hit_sound=groan.wav
 	damage=12
 	number=2
 	special=drain
+		[frame]
+		begin=-100
+		end=100
+		image=undead-demilich-attack.png
+		[/frame]
 	[/attack]
 	[attack]
 	name=magic
@@ -35,6 +40,21 @@ get_hit_sound=groan.wav
 		image=projectiles/darkmissile-n.png
 		image_diagonal=projectiles/darkmissile-ne.png
 		[/missile_frame]
+		[frame]
+		begin=-300
+		end=-200
+		image=undead-demilich-ranged1.png
+		[/frame]
+		[frame]
+		begin=-200
+		end=-100
+		image=undead-demilich-ranged2.png
+		[/frame]
+		[frame]
+		begin=-100
+		end=50
+		image=undead-demilich-ranged1.png
+		[/frame]
 		[sound]
 		time=-200
 		sound=magic.wav
diff --git a/images/undead-deathmaster-attack1.png b/images/undead-deathmaster-attack1.png
new file mode 100644
index 00000000000..e46803b4aac
Binary files /dev/null and b/images/undead-deathmaster-attack1.png differ
diff --git a/images/undead-deathmaster-attack2.png b/images/undead-deathmaster-attack2.png
new file mode 100644
index 00000000000..5d0891bce5e
Binary files /dev/null and b/images/undead-deathmaster-attack2.png differ
diff --git a/images/undead-deathmaster-defend.png b/images/undead-deathmaster-defend.png
new file mode 100644
index 00000000000..5d3b35f2dc7
Binary files /dev/null and b/images/undead-deathmaster-defend.png differ
diff --git a/images/undead-deathmaster-ranged1.png b/images/undead-deathmaster-ranged1.png
new file mode 100644
index 00000000000..febbb0cb182
Binary files /dev/null and b/images/undead-deathmaster-ranged1.png differ
diff --git a/images/undead-deathmaster-ranged2.png b/images/undead-deathmaster-ranged2.png
new file mode 100644
index 00000000000..60e95530eeb
Binary files /dev/null and b/images/undead-deathmaster-ranged2.png differ
diff --git a/images/undead-deathmaster-ranged3.png b/images/undead-deathmaster-ranged3.png
new file mode 100644
index 00000000000..01320be7ed8
Binary files /dev/null and b/images/undead-deathmaster-ranged3.png differ
diff --git a/images/undead-deathmaster-ranged4.png b/images/undead-deathmaster-ranged4.png
new file mode 100644
index 00000000000..068bdfc1e0d
Binary files /dev/null and b/images/undead-deathmaster-ranged4.png differ
diff --git a/images/undead-deathmaster.png b/images/undead-deathmaster.png
new file mode 100644
index 00000000000..57c1a5e777d
Binary files /dev/null and b/images/undead-deathmaster.png differ
diff --git a/images/undead-demilich-attack.png b/images/undead-demilich-attack.png
new file mode 100644
index 00000000000..af17775409e
Binary files /dev/null and b/images/undead-demilich-attack.png differ
diff --git a/images/undead-demilich-ranged1.png b/images/undead-demilich-ranged1.png
new file mode 100644
index 00000000000..27e1d5ba838
Binary files /dev/null and b/images/undead-demilich-ranged1.png differ
diff --git a/images/undead-demilich-ranged2.png b/images/undead-demilich-ranged2.png
new file mode 100644
index 00000000000..b48c98daa37
Binary files /dev/null and b/images/undead-demilich-ranged2.png differ
diff --git a/images/undead-demilich.png b/images/undead-demilich.png
new file mode 100644
index 00000000000..f1839e9e007
Binary files /dev/null and b/images/undead-demilich.png differ