diff --git a/data/game.cfg b/data/game.cfg
index e60383d7258..61784d39ede 100644
--- a/data/game.cfg
+++ b/data/game.cfg
@@ -948,7 +948,52 @@
 		holy=100
 	 	[/resistance]
 	[/movetype]
-		
+
+	[movetype]
+	name=drakonian
+	# drakonians are huge flying beast, but to fight they have to land
+	# thus, they are awful on water
+	# they love caves and mountains, and above all: warmth
+		[movement costs]
+		deep water=1
+		shallow water=1
+		swamp water=1
+		grassland=1
+		sand=1
+		forest=1
+		hills=1
+		mountains=1
+		village=1
+		castle=1
+		cave=1
+		cavewall=100
+		tundra=1
+		[/movement costs]
+
+		[defense]
+		deep water=90
+		shallow water=80
+		swamp water=70
+		grassland=60
+		sand=60
+		forest=70
+		hills=60
+		mountains=50
+		village=60
+		castle=50
+		cave=50
+		tundra=70
+		[/defense]
+
+		[resistance]
+		blade=90
+		pierce=110
+		impact=80
+		fire=50
+		cold=150
+		holy=80
+		[/resistance]
+	[/movetype]
 [/units]
 
 {tutorial.cfg}
diff --git a/data/units/Drakonian_Fighter.cfg b/data/units/Drakonian_Fighter.cfg
new file mode 100644
index 00000000000..4c45641523c
--- /dev/null
+++ b/data/units/Drakonian_Fighter.cfg
@@ -0,0 +1,67 @@
+[unit]
+name=Drakonian Fighter
+race=drakonian
+image=drakonian-fighter.png
+image_defensive=drakonian-fighter-defend.png
+hitpoints=45
+movement_type=drakonian
+movement=5
+experience=50
+level=1
+alignment=neutral
+advanceto=null
+#advanceto=Drakonian Warrior, Drakonian Guard
+cost=22
+usage=fighter
+unit_description=""
+get_hit_sound=groan.wav
+	[attack]
+	name=sword
+	type=blade
+	range=short
+	damage=8
+	number=3
+		[frame]
+		begin=-200
+		end=-50
+		image=drakonian-fighter-attack-close1.png
+		[/frame]
+		[frame]
+		begin=-50
+		end=100
+		image=drakonian-fighter-attack-close2.png
+		[/frame]
+		[sound]
+		time=-150
+		sound=sword-swish.wav
+		[/sound]
+	[/attack]
+
+	[attack]
+	name=fire breath
+	type=fire
+	range=long
+	damage=8
+	number=2
+		[frame]
+		begin=-300
+		end=-200
+		image=drakonian-fighter-attack-fire1.png
+		[/frame]
+		[frame]
+		begin=-200
+		end=-100
+		image=drakonian-fighter-attack-fire2.png
+		[/frame]
+		[sound]
+		time=-200
+		sound=fire.wav
+		[/sound]
+		[missile_frame]
+		begin=-100
+		end=0
+		image=fireball.png
+		[/missile_frame]
+	[/attack]
+
+[/unit]
diff --git a/images/drakonian-fighter-attack-close1.png b/images/drakonian-fighter-attack-close1.png
new file mode 100644
index 00000000000..e65b6f01f22
Binary files /dev/null and b/images/drakonian-fighter-attack-close1.png differ
diff --git a/images/drakonian-fighter-attack-close2.png b/images/drakonian-fighter-attack-close2.png
new file mode 100644
index 00000000000..d2161820245
Binary files /dev/null and b/images/drakonian-fighter-attack-close2.png differ
diff --git a/images/drakonian-fighter-attack-fire1.png b/images/drakonian-fighter-attack-fire1.png
new file mode 100644
index 00000000000..73e52f23d91
Binary files /dev/null and b/images/drakonian-fighter-attack-fire1.png differ
diff --git a/images/drakonian-fighter-attack-fire2.png b/images/drakonian-fighter-attack-fire2.png
new file mode 100644
index 00000000000..5c554c03e01
Binary files /dev/null and b/images/drakonian-fighter-attack-fire2.png differ
diff --git a/images/drakonian-fighter-defend.png b/images/drakonian-fighter-defend.png
new file mode 100644
index 00000000000..548fc39cf6e
Binary files /dev/null and b/images/drakonian-fighter-defend.png differ
diff --git a/images/drakonian-fighter.png b/images/drakonian-fighter.png
new file mode 100644
index 00000000000..62226295ec0
Binary files /dev/null and b/images/drakonian-fighter.png differ