diff --git a/binaries/data/mods/public/art/actors/fauna/giraffe_adult.xml b/binaries/data/mods/public/art/actors/fauna/giraffe_adult.xml
new file mode 100644
index 0000000000..074623e47b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/fauna/giraffe_adult.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Giraffe Adult">
+      <mesh>skeletal/giraffe_adult.dae</mesh>
+      <texture>skeletal/animal_giraffe.png</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/fauna/giraffe_baby.xml b/binaries/data/mods/public/art/actors/fauna/giraffe_baby.xml
new file mode 100644
index 0000000000..0e23e55e4e
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/fauna/giraffe_baby.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Giraffe Adult">
+      <mesh>skeletal/giraffe_infant.dae</mesh>
+      <texture>skeletal/animal_giraffe.png</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/meshes/skeletal/giraffe_adult.dae b/binaries/data/mods/public/art/meshes/skeletal/giraffe_adult.dae
new file mode 100644
index 0000000000..f7941f8e22
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/skeletal/giraffe_adult.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a653faba5fa7ada3e7405ea14a15a5db95b83fec61636e1d376a704b1f7ccb3
+size 149834
diff --git a/binaries/data/mods/public/art/meshes/skeletal/giraffe_infant.dae b/binaries/data/mods/public/art/meshes/skeletal/giraffe_infant.dae
new file mode 100644
index 0000000000..2b96132559
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/skeletal/giraffe_infant.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e76aab01e6426e1479b82998962ee45c8bae889eef1d848dd79ede5d718c1e6
+size 149833
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/animal_giraffe.png b/binaries/data/mods/public/art/textures/skins/skeletal/animal_giraffe.png
new file mode 100644
index 0000000000..f1c319126b
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/animal_giraffe.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a724f3aa5acd67731e2e2442a5681b4c33f7c992382207067638be04a496c52
+size 348900
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_animal.dds b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_animal.dds
index d8e6b21773..cdee9b520d 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_animal.dds
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/gaia_animal.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a87c8890f7cdf37f2d39117bdef0a438d0ef9bd6e79c2870991d9dbb25e89ed
+oid sha256:19816d4d7df5f6e9594e4a36f13dad561478592d4fa43ba246dbbab5259672eb
 size 174928
diff --git a/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml b/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml
index babe4f1b65..db4c04dc5d 100644
--- a/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94c890fdb64d0d6903d7dfc4bb467365c0ee267af0e2f16e06f30076036c252e
-size 188373
+oid sha256:7b27a94e7248cfd39721f7b64c67ccef5045aa3caf703d86ffc625e7307e086c
+size 189478
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
new file mode 100644
index 0000000000..6d776b3433
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_hunt_skittish">
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Giraffe (Adult)</SpecificName>
+	<IconCell>21</IconCell>
+  </Identity>
+  <ResourceSupply>
+    <Amount>350</Amount>
+    <Type>food.meat</Type>
+  </ResourceSupply>
+  <UnitMotion>
+    <WalkSpeed>4.0</WalkSpeed>
+    <Run>
+      <Speed>12.0</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Footprint>
+    <Circle radius="2.75"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Unit radius="2.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>fauna/giraffe_adult.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
new file mode 100644
index 0000000000..bd88a7111b
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_hunt_skittish">
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Giraffe (Infant)</SpecificName>
+	<IconCell>21</IconCell>
+  </Identity>
+  <ResourceSupply>
+    <Amount>150</Amount>
+    <Type>food.meat</Type>
+  </ResourceSupply>
+  <UnitMotion>
+    <WalkSpeed>4.0</WalkSpeed>
+    <Run>
+      <Speed>10.0</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Footprint>
+    <Circle radius="2.0"/>
+    <Height>2.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Unit radius="1.5"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>fauna/giraffe_baby.xml</Actor>
+  </VisualActor>
+</Entity>