diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/EnchantItemData.xml
index f53c83fbbd..85c6821790 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/EnchantItemData.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Weapon -->
-	<enchant id="729" targetGrade="A" />
-	<enchant id="947" targetGrade="B" />
-	<enchant id="951" targetGrade="C" />
-	<enchant id="955" targetGrade="D" />
+	<enchant id="729" targetGrade="A" maxEnchant="16" />
+	<enchant id="947" targetGrade="B" maxEnchant="16" />
+	<enchant id="951" targetGrade="C" maxEnchant="16" />
+	<enchant id="955" targetGrade="D" maxEnchant="16" />
 
 	<!-- Scrolls: Enchant Armor -->
-	<enchant id="730" targetGrade="A" />
-	<enchant id="948" targetGrade="B" />
-	<enchant id="952" targetGrade="C" />
-	<enchant id="956" targetGrade="D" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
+	<enchant id="730" targetGrade="A" maxEnchant="16" />
+	<enchant id="948" targetGrade="B" maxEnchant="16" />
+	<enchant id="952" targetGrade="C" maxEnchant="16" />
+	<enchant id="956" targetGrade="D" maxEnchant="16" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
 
 	<!-- Blessed Scrolls: Enchant Weapon -->
-	<enchant id="6569" targetGrade="A" />
-	<enchant id="6571" targetGrade="B" />
-	<enchant id="6573" targetGrade="C" />
-	<enchant id="6575" targetGrade="D" />
+	<enchant id="6569" targetGrade="A" maxEnchant="16" />
+	<enchant id="6571" targetGrade="B" maxEnchant="16" />
+	<enchant id="6573" targetGrade="C" maxEnchant="16" />
+	<enchant id="6575" targetGrade="D" maxEnchant="16" />
 
 	<!-- Blessed Scrolls: Enchant Armor -->
-	<enchant id="6570" targetGrade="A" />
-	<enchant id="6572" targetGrade="B" />
-	<enchant id="6574" targetGrade="C" />
-	<enchant id="6576" targetGrade="D" />
+	<enchant id="6570" targetGrade="A" maxEnchant="16" />
+	<enchant id="6572" targetGrade="B" maxEnchant="16" />
+	<enchant id="6574" targetGrade="C" maxEnchant="16" />
+	<enchant id="6576" targetGrade="D" maxEnchant="16" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/EnchantItemData.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/EnchantItemData.xsd
index 6f29f34b99..fa9af50a1b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/EnchantItemData.xsd
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/EnchantItemData.xsd
@@ -9,6 +9,7 @@
 								<xs:attribute type="xs:short" name="id" use="optional"/>
 								<xs:attribute type="xs:string" name="targetGrade" use="optional"/>
 								<xs:attribute type="xs:byte" name="scrollGroupId" use="optional"/>
+								<xs:attribute type="xs:int" name="maxEnchant" use="optional"/> <!-- enchant limit -->
 							</xs:extension>
 						</xs:simpleContent>
 					</xs:complexType>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/EnchantItemData.xml
index f53c83fbbd..85c6821790 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/EnchantItemData.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Weapon -->
-	<enchant id="729" targetGrade="A" />
-	<enchant id="947" targetGrade="B" />
-	<enchant id="951" targetGrade="C" />
-	<enchant id="955" targetGrade="D" />
+	<enchant id="729" targetGrade="A" maxEnchant="16" />
+	<enchant id="947" targetGrade="B" maxEnchant="16" />
+	<enchant id="951" targetGrade="C" maxEnchant="16" />
+	<enchant id="955" targetGrade="D" maxEnchant="16" />
 
 	<!-- Scrolls: Enchant Armor -->
-	<enchant id="730" targetGrade="A" />
-	<enchant id="948" targetGrade="B" />
-	<enchant id="952" targetGrade="C" />
-	<enchant id="956" targetGrade="D" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
+	<enchant id="730" targetGrade="A" maxEnchant="16" />
+	<enchant id="948" targetGrade="B" maxEnchant="16" />
+	<enchant id="952" targetGrade="C" maxEnchant="16" />
+	<enchant id="956" targetGrade="D" maxEnchant="16" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
 
 	<!-- Blessed Scrolls: Enchant Weapon -->
-	<enchant id="6569" targetGrade="A" />
-	<enchant id="6571" targetGrade="B" />
-	<enchant id="6573" targetGrade="C" />
-	<enchant id="6575" targetGrade="D" />
+	<enchant id="6569" targetGrade="A" maxEnchant="16" />
+	<enchant id="6571" targetGrade="B" maxEnchant="16" />
+	<enchant id="6573" targetGrade="C" maxEnchant="16" />
+	<enchant id="6575" targetGrade="D" maxEnchant="16" />
 
 	<!-- Blessed Scrolls: Enchant Armor -->
-	<enchant id="6570" targetGrade="A" />
-	<enchant id="6572" targetGrade="B" />
-	<enchant id="6574" targetGrade="C" />
-	<enchant id="6576" targetGrade="D" />
+	<enchant id="6570" targetGrade="A" maxEnchant="16" />
+	<enchant id="6572" targetGrade="B" maxEnchant="16" />
+	<enchant id="6574" targetGrade="C" maxEnchant="16" />
+	<enchant id="6576" targetGrade="D" maxEnchant="16" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/EnchantItemData.xsd b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/EnchantItemData.xsd
index 6f29f34b99..fa9af50a1b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/EnchantItemData.xsd
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/EnchantItemData.xsd
@@ -9,6 +9,7 @@
 								<xs:attribute type="xs:short" name="id" use="optional"/>
 								<xs:attribute type="xs:string" name="targetGrade" use="optional"/>
 								<xs:attribute type="xs:byte" name="scrollGroupId" use="optional"/>
+								<xs:attribute type="xs:int" name="maxEnchant" use="optional"/> <!-- enchant limit -->
 							</xs:extension>
 						</xs:simpleContent>
 					</xs:complexType>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/EnchantItemData.xml
index f53c83fbbd..85c6821790 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/EnchantItemData.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Weapon -->
-	<enchant id="729" targetGrade="A" />
-	<enchant id="947" targetGrade="B" />
-	<enchant id="951" targetGrade="C" />
-	<enchant id="955" targetGrade="D" />
+	<enchant id="729" targetGrade="A" maxEnchant="16" />
+	<enchant id="947" targetGrade="B" maxEnchant="16" />
+	<enchant id="951" targetGrade="C" maxEnchant="16" />
+	<enchant id="955" targetGrade="D" maxEnchant="16" />
 
 	<!-- Scrolls: Enchant Armor -->
-	<enchant id="730" targetGrade="A" />
-	<enchant id="948" targetGrade="B" />
-	<enchant id="952" targetGrade="C" />
-	<enchant id="956" targetGrade="D" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
+	<enchant id="730" targetGrade="A" maxEnchant="16" />
+	<enchant id="948" targetGrade="B" maxEnchant="16" />
+	<enchant id="952" targetGrade="C" maxEnchant="16" />
+	<enchant id="956" targetGrade="D" maxEnchant="16" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
 
 	<!-- Blessed Scrolls: Enchant Weapon -->
-	<enchant id="6569" targetGrade="A" />
-	<enchant id="6571" targetGrade="B" />
-	<enchant id="6573" targetGrade="C" />
-	<enchant id="6575" targetGrade="D" />
+	<enchant id="6569" targetGrade="A" maxEnchant="16" />
+	<enchant id="6571" targetGrade="B" maxEnchant="16" />
+	<enchant id="6573" targetGrade="C" maxEnchant="16" />
+	<enchant id="6575" targetGrade="D" maxEnchant="16" />
 
 	<!-- Blessed Scrolls: Enchant Armor -->
-	<enchant id="6570" targetGrade="A" />
-	<enchant id="6572" targetGrade="B" />
-	<enchant id="6574" targetGrade="C" />
-	<enchant id="6576" targetGrade="D" />
+	<enchant id="6570" targetGrade="A" maxEnchant="16" />
+	<enchant id="6572" targetGrade="B" maxEnchant="16" />
+	<enchant id="6574" targetGrade="C" maxEnchant="16" />
+	<enchant id="6576" targetGrade="D" maxEnchant="16" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/EnchantItemData.xsd b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/EnchantItemData.xsd
index 6f29f34b99..fa9af50a1b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/EnchantItemData.xsd
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/EnchantItemData.xsd
@@ -9,6 +9,7 @@
 								<xs:attribute type="xs:short" name="id" use="optional"/>
 								<xs:attribute type="xs:string" name="targetGrade" use="optional"/>
 								<xs:attribute type="xs:byte" name="scrollGroupId" use="optional"/>
+								<xs:attribute type="xs:int" name="maxEnchant" use="optional"/> <!-- enchant limit -->
 							</xs:extension>
 						</xs:simpleContent>
 					</xs:complexType>