diff --git a/binaries/data/mods/internal/art/actors/structures/romans/quinquereme.xml b/binaries/data/mods/internal/art/actors/structures/romans/quinquereme.xml
index fcaa417585..1a7b8dbfd1 100644
--- a/binaries/data/mods/internal/art/actors/structures/romans/quinquereme.xml
+++ b/binaries/data/mods/internal/art/actors/structures/romans/quinquereme.xml
@@ -1,33 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <float/>
-
   <group>
     <variant frequency="100" name="Base">
       <mesh>structural/rome_qui.dae</mesh>
       <texture>structural/rome_qui.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="sail">
       <props>
-        <prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root" />
-        <prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root" />
-        <prop actor="props/structures/romans/quinquereme_mast.xml" attachpoint="root" />
+        <prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root"/>
+        <prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root"/>
+        <prop actor="props/structures/romans/quinquereme_mast.xml" attachpoint="root"/>
+        <prop actor="props/units/weapons/rock.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant frequency="1" name="no-sail">
       <props>
-        <prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root" />
-        <prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root" />
+        <prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root"/>
+        <prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root"/>
+        <prop actor="props/units/weapons/rock.xml" attachpoint="projectile"/>
       </props>
     </variant>
   </group>
-
   <material>basic_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/celts/trireme.xml b/binaries/data/mods/public/art/actors/structures/celts/trireme.xml
index 91914f5303..5d026b72a2 100644
--- a/binaries/data/mods/public/art/actors/structures/celts/trireme.xml
+++ b/binaries/data/mods/public/art/actors/structures/celts/trireme.xml
@@ -7,6 +7,7 @@
       <mesh>structural/celt_barge.dae</mesh>
       <props>
         <prop actor="props/structures/celts/celt_tri1.xml" attachpoint="root"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
       </props>
       <texture>structural/celt_trireme.dds</texture>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/bireme.xml b/binaries/data/mods/public/art/actors/structures/hellenes/bireme.xml
index f1fb85a49a..02f8081e6f 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/bireme.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/bireme.xml
@@ -9,6 +9,7 @@
         <prop actor="props/structures/hellenes/hele_bir1.xml" attachpoint="props_main"/>
         <prop actor="props/structures/hellenes/hele_bir2.xml" attachpoint="mast"/>
         <prop actor="props/structures/hellenes/hele_bir3.xml" attachpoint="oars"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
       </props>
       <texture>structural/hele_bireme.dds</texture>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/trireme.xml b/binaries/data/mods/public/art/actors/structures/hellenes/trireme.xml
index bdf011ffcc..de7bed6cbe 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/trireme.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/trireme.xml
@@ -9,6 +9,7 @@
         <prop actor="props/structures/hellenes/hele_tri1.xml" attachpoint="props_main"/>
         <prop actor="props/structures/hellenes/hele_tri2.xml" attachpoint="mast"/>
         <prop actor="props/structures/hellenes/hele_tri3.xml" attachpoint="oars"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
         <prop actor="" attachpoint="12"/>
         <prop actor="" attachpoint="16"/>
         <prop actor="" attachpoint="17"/>
diff --git a/binaries/data/mods/public/maps/scenarios/shipattacks.pmp b/binaries/data/mods/public/maps/scenarios/shipattacks.pmp
new file mode 100644
index 0000000000..53c429f070
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/shipattacks.pmp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06dd5eb34aa7321fd4f0fab4ec22057a0b06388f6532f36bee95731aeb1088b7
+size 369447
diff --git a/binaries/data/mods/public/maps/scenarios/shipattacks.xml b/binaries/data/mods/public/maps/scenarios/shipattacks.xml
new file mode 100644
index 0000000000..78996423df
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/shipattacks.xml
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1dd9efdb825b1179dae018d7a95bca53b030edc4b548a6d935eafc1574a6704
+size 3748
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml
index eb8a4e755c..fc5a0653f2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml
@@ -19,15 +19,6 @@
   <Health>
     <Max>100</Max>
   </Health>
-  <Attack>
-    <Charge>
-      <Hack>0.0</Hack>
-      <Pierce>10.0</Pierce>
-      <Crush>10.0</Crush>
-      <MaxRange>2.0</MaxRange>
-      <MinRange>0.0</MinRange>
-    </Charge>
-  </Attack>
   <Decay>
     <Inactive/>
     <DelayTime>0.0</DelayTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
index a57f7fa214..15c3011fc2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
@@ -22,10 +22,27 @@
     <Pierce>15.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>40.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>64.0</MaxRange>
+      <MinRange>10.0</MinRange>
+      <ProjectileSpeed>50.0</ProjectileSpeed>
+      <PrepareTime>2000</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+    </Ranged>
+  </Attack>
   <GarrisonHolder>
     <Max>20</Max>
 	<EjectHealth>0.1</EjectHealth>
 	<List datatype="tokens">Support Infantry Cavalry</List>
 	<BuffHeal>1</BuffHeal>
   </GarrisonHolder>
+  <Sound>
+    <SoundGroups>
+      <attack_impact>attack/impact/arrow_metal.xml</attack_impact>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
index 2518e19b18..9e7f7dc4be 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
@@ -25,6 +25,18 @@
   <Vision>
     <Range>160</Range>
   </Vision>
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>50.0</Pierce>
+      <Crush>100.0</Crush>
+      <MaxRange>100.0</MaxRange>
+      <MinRange>20.0</MinRange>
+      <ProjectileSpeed>40.0</ProjectileSpeed>
+      <PrepareTime>4000</PrepareTime>
+      <RepeatTime>4000</RepeatTime>
+    </Ranged>
+  </Attack>
   <GarrisonHolder>
     <Max>40</Max>
 	<EjectHealth>0.1</EjectHealth>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
index dd0d0825c1..d9eae03c05 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
@@ -22,10 +22,27 @@
     <Pierce>20.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>50.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>80.0</MaxRange>
+      <MinRange>10.0</MinRange>
+      <ProjectileSpeed>50.0</ProjectileSpeed>
+      <PrepareTime>1000</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+    </Ranged>
+  </Attack>
   <GarrisonHolder>
     <Max>30</Max>
 	<EjectHealth>0.1</EjectHealth>
 	<List datatype="tokens">Support Infantry Cavalry</List>
 	<BuffHeal>1</BuffHeal>
   </GarrisonHolder>
+  <Sound>
+    <SoundGroups>
+      <attack_impact>attack/impact/arrow_metal.xml</attack_impact>
+    </SoundGroups>
+  </Sound>
 </Entity>