diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java
index a35474f440..ff0f49244b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java
@@ -114,12 +114,18 @@ public class FuncEnchant extends AbstractFunction
 				{
 					if (item.getWeaponItem().getBodyPart() == Item.SLOT_LR_HAND)
 					{
-						if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW))
+						if (type == WeaponType.BOW)
 						{
 							// P. Atk. increases by 10 for bows.
 							// Starting at +4, P. Atk. bonus double.
 							value += (10 * enchant) + (20 * overenchant);
 						}
+						else if (type == WeaponType.CROSSBOW)
+						{
+							// P. Atk. increases by 7 for crossbows.
+							// Starting at +4, P. Atk. bonus double.
+							value += (7 * enchant) + (14 * overenchant);
+						}
 						else
 						{
 							// P. Atk. increases by 6 for two-handed swords, two-handed blunts, dualswords, and two-handed combat weapons.
@@ -139,12 +145,18 @@ public class FuncEnchant extends AbstractFunction
 				{
 					if (item.getWeaponItem().getBodyPart() == Item.SLOT_LR_HAND)
 					{
-						if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW))
+						if (type == WeaponType.BOW)
 						{
 							// P. Atk. increases by 8 for bows.
 							// Starting at +4, P. Atk. bonus double.
 							value += (8 * enchant) + (16 * overenchant);
 						}
+						else if (type == WeaponType.CROSSBOW)
+						{
+							// P. Atk. increases by 6 for crossbows.
+							// Starting at +4, P. Atk. bonus double.
+							value += (6 * enchant) + (12 * overenchant);
+						}
 						else
 						{
 							// P. Atk. increases by 5 for two-handed swords, two-handed blunts, dualswords, and two-handed combat weapons.
@@ -165,12 +177,18 @@ public class FuncEnchant extends AbstractFunction
 				{
 					if (item.getWeaponItem().getBodyPart() == Item.SLOT_LR_HAND)
 					{
-						if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW))
+						if (type == WeaponType.BOW)
 						{
 							// P. Atk. increases by 6 for bows.
 							// Starting at +4, P. Atk. bonus double.
 							value += (6 * enchant) + (12 * overenchant);
 						}
+						else if (type == WeaponType.CROSSBOW)
+						{
+							// P. Atk. increases by 5 for crossbows.
+							// Starting at +4, P. Atk. bonus double.
+							value += (5 * enchant) + (10 * overenchant);
+						}
 						else
 						{
 							// P. Atk. increases by 4 for two-handed swords, two-handed blunts, dualswords, and two-handed combat weapons.
@@ -192,13 +210,19 @@ public class FuncEnchant extends AbstractFunction
 					switch (type)
 					{
 						case BOW:
-						case CROSSBOW:
 						{
 							// Bows increase by 4.
 							// Starting at +4, P. Atk. bonus double.
 							value += (4 * enchant) + (8 * overenchant);
 							break;
 						}
+						case CROSSBOW:
+						{
+							// Crossbows increase by 3.
+							// Starting at +4, P. Atk. bonus double.
+							value += (3 * enchant) + (6 * overenchant);
+							break;
+						}
 						default:
 						{
 							// P. Atk. increases by 2 for all weapons with the exception of bows.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java
index a35474f440..ff0f49244b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java
@@ -114,12 +114,18 @@ public class FuncEnchant extends AbstractFunction
 				{
 					if (item.getWeaponItem().getBodyPart() == Item.SLOT_LR_HAND)
 					{
-						if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW))
+						if (type == WeaponType.BOW)
 						{
 							// P. Atk. increases by 10 for bows.
 							// Starting at +4, P. Atk. bonus double.
 							value += (10 * enchant) + (20 * overenchant);
 						}
+						else if (type == WeaponType.CROSSBOW)
+						{
+							// P. Atk. increases by 7 for crossbows.
+							// Starting at +4, P. Atk. bonus double.
+							value += (7 * enchant) + (14 * overenchant);
+						}
 						else
 						{
 							// P. Atk. increases by 6 for two-handed swords, two-handed blunts, dualswords, and two-handed combat weapons.
@@ -139,12 +145,18 @@ public class FuncEnchant extends AbstractFunction
 				{
 					if (item.getWeaponItem().getBodyPart() == Item.SLOT_LR_HAND)
 					{
-						if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW))
+						if (type == WeaponType.BOW)
 						{
 							// P. Atk. increases by 8 for bows.
 							// Starting at +4, P. Atk. bonus double.
 							value += (8 * enchant) + (16 * overenchant);
 						}
+						else if (type == WeaponType.CROSSBOW)
+						{
+							// P. Atk. increases by 6 for crossbows.
+							// Starting at +4, P. Atk. bonus double.
+							value += (6 * enchant) + (12 * overenchant);
+						}
 						else
 						{
 							// P. Atk. increases by 5 for two-handed swords, two-handed blunts, dualswords, and two-handed combat weapons.
@@ -165,12 +177,18 @@ public class FuncEnchant extends AbstractFunction
 				{
 					if (item.getWeaponItem().getBodyPart() == Item.SLOT_LR_HAND)
 					{
-						if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW))
+						if (type == WeaponType.BOW)
 						{
 							// P. Atk. increases by 6 for bows.
 							// Starting at +4, P. Atk. bonus double.
 							value += (6 * enchant) + (12 * overenchant);
 						}
+						else if (type == WeaponType.CROSSBOW)
+						{
+							// P. Atk. increases by 5 for crossbows.
+							// Starting at +4, P. Atk. bonus double.
+							value += (5 * enchant) + (10 * overenchant);
+						}
 						else
 						{
 							// P. Atk. increases by 4 for two-handed swords, two-handed blunts, dualswords, and two-handed combat weapons.
@@ -192,13 +210,19 @@ public class FuncEnchant extends AbstractFunction
 					switch (type)
 					{
 						case BOW:
-						case CROSSBOW:
 						{
 							// Bows increase by 4.
 							// Starting at +4, P. Atk. bonus double.
 							value += (4 * enchant) + (8 * overenchant);
 							break;
 						}
+						case CROSSBOW:
+						{
+							// Crossbows increase by 3.
+							// Starting at +4, P. Atk. bonus double.
+							value += (3 * enchant) + (6 * overenchant);
+							break;
+						}
 						default:
 						{
 							// P. Atk. increases by 2 for all weapons with the exception of bows.