diff --git a/data/units/Dwarvish_Thunderer.cfg b/data/units/Dwarvish_Thunderer.cfg
index 6178d236f93..3b7b34b3a5e 100644
--- a/data/units/Dwarvish_Thunderer.cfg
+++ b/data/units/Dwarvish_Thunderer.cfg
@@ -9,10 +9,10 @@ movement=4
 experience=40
 level=1
 alignment=neutral
-advanceto=null
+advanceto=Dwarvish Thunderguard
 cost=19
 usage=fighter
-unit_description="Dwarvish Thunderers provide much needed ranged support to the mighty, yet slow, close-range fighters of the Dwarvish armies. Their heavy muskets are slower, cruder and noisier than the elegant and swift elvish bows, but their impact is unmatched."
+unit_description="Dwarvish Thunderers provide much needed ranged support to the mighty, yet slow, close-range fighters of the Dwarvish armies. Their mysterious weapons are slower, cruder and noisier than the elegant and swift elvish bows, but their impact is unmatched."
 get_hit_sound=groan.wav
 
 	[resistance]
diff --git a/data/units/Dwarvish_Thunderguard.cfg b/data/units/Dwarvish_Thunderguard.cfg
new file mode 100644
index 00000000000..4930cdecd1f
--- /dev/null
+++ b/data/units/Dwarvish_Thunderguard.cfg
@@ -0,0 +1,77 @@
+[unit]
+name=Dwarvish Thunderguard
+race=dwarf
+image=dwarf-thunderguard.png
+image_defensive=dwarf-thunderguard-defend.png
+hitpoints=42
+movement_type=mountainfoot
+movement=4
+experience=500
+level=2
+alignment=neutral
+advanceto=null
+cost=30
+usage=fighter
+unit_description="The famed Dwarvish Thunderguards wield mysterious and feared weapons that are based on arcane Dwarvish technology. They are no faster than the more common Thunderers, but their attack is much more deadly."
+get_hit_sound=groan.wav
+
+	[resistance]
+	blade=70
+	pierce=80
+	impact=80
+	fire=90
+	cold=80
+	[/resistance]
+
+	[attack]
+	name=knife
+	type=blade
+	range=short
+	damage=6
+	number=2
+
+		[frame]
+		begin=-150
+		end=-50
+		image=dwarf-thunderguard-attack1.png
+		[/frame]
+
+		[frame]
+		begin=-50
+		end=50
+		image=dwarf-thunderguard-attack2.png
+		[/frame]
+		
+		[sound]
+		time=-250
+		sound=sword-swish.wav
+		[/sound]
+
+	[/attack]
+	
+	[attack]
+	name=dragonstick
+	type=pierce
+	range=long
+	damage=28
+	number=1
+
+		[sound]
+		time=-150
+		sound=gunshot.wav
+		[/sound]
+
+		[frame]
+		begin=-350
+		end=600
+		image=dwarf-thunderguard-attack.png
+		[/frame]
+		[missile_frame]
+		begin=-150
+		end=0
+		image=bullet.png
+		[/missile_frame]
+
+	[/attack]
+	
+[/unit]
diff --git a/images/dwarf-thunderguard-attack.png b/images/dwarf-thunderguard-attack.png
new file mode 100644
index 00000000000..ad2ee20df73
Binary files /dev/null and b/images/dwarf-thunderguard-attack.png differ
diff --git a/images/dwarf-thunderguard-attack1.png b/images/dwarf-thunderguard-attack1.png
new file mode 100644
index 00000000000..0c330e87500
Binary files /dev/null and b/images/dwarf-thunderguard-attack1.png differ
diff --git a/images/dwarf-thunderguard-attack2.png b/images/dwarf-thunderguard-attack2.png
new file mode 100644
index 00000000000..d5009d00ec3
Binary files /dev/null and b/images/dwarf-thunderguard-attack2.png differ
diff --git a/images/dwarf-thunderguard-defend.png b/images/dwarf-thunderguard-defend.png
new file mode 100644
index 00000000000..32400d9dfde
Binary files /dev/null and b/images/dwarf-thunderguard-defend.png differ
diff --git a/images/dwarf-thunderguard.png b/images/dwarf-thunderguard.png
new file mode 100644
index 00000000000..8ed79e5ce30
Binary files /dev/null and b/images/dwarf-thunderguard.png differ