diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 470c7040d..952464eec 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -1,6 +1,7 @@
 #include "weapon.hpp"
 
 #include <components/esm/loadweap.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -261,8 +262,8 @@ namespace MWClass
 
         std::string text;
 
-        // weapon type & damage. arrows / bolts don't have his info.
-        if (ref->mBase->mData.mType < 12)
+        // weapon type & damage
+        if ((ref->mBase->mData.mType < 12 || Settings::Manager::getBool("show projectile damage", "Game")) && ref->mBase->mData.mType < 14)
         {
             text += "\n#{sType} ";
 
@@ -279,6 +280,8 @@ namespace MWClass
             mapping[ESM::Weapon::MarksmanBow] = std::make_pair("sSkillMarksman", "");
             mapping[ESM::Weapon::MarksmanCrossbow] = std::make_pair("sSkillMarksman", "");
             mapping[ESM::Weapon::MarksmanThrown] = std::make_pair("sSkillMarksman", "");
+            mapping[ESM::Weapon::Arrow] = std::make_pair("sSkillMarksman", "");
+            mapping[ESM::Weapon::Bolt] = std::make_pair("sSkillMarksman", "");
 
             std::string type = mapping[ref->mBase->mData.mType].first;
             std::string oneOrTwoHanded = mapping[ref->mBase->mData.mType].second;
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 55f550d5a..472e9c596 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -146,6 +146,9 @@ crosshair = true
 # no color, 1 is tool tip only, 2 is crosshair only, and 3 is both).
 show owned = 0
 
+# Show damage bonus of arrow and bolts.
+show projectile damage = false
+
 # Always use the best mode of attack: e.g. chop, slash or thrust.
 best attack = false