diff --git a/generator/mavschema.xsd b/generator/mavschema.xsd
index a0e79723d..63e3342cd 100644
--- a/generator/mavschema.xsd
+++ b/generator/mavschema.xsd
@@ -27,18 +27,18 @@
 <xs:attribute name="value"> <!-- used in entry elements -->
   <xs:simpleType>
     <xs:restriction base="xs:string">
-        <xs:pattern value="\d{1,10}"/> <!-- base 10 int -->
-        <xs:pattern value="0[xX][0-9a-fA-F]{1,8}"/> <!-- base 16 -->
-        <xs:pattern value="0[bB][0-1]{1,32}"/> <!-- base 1 -->
+        <xs:pattern value="\d{1,20}"/> <!-- base 10 int -->
+        <xs:pattern value="0[xX][0-9a-fA-F]{1,16}"/> <!-- base 16 -->
+        <xs:pattern value="0[bB][0-1]{1,64}"/> <!-- base 1 -->
     </xs:restriction>
   </xs:simpleType>
 </xs:attribute>
 <xs:attribute name="default"> <!-- used in enum field elements -->
   <xs:simpleType>
     <xs:restriction base="xs:string">
-        <xs:pattern value="\d{1,10}"/> <!-- base 10 int -->
-        <xs:pattern value="0[xX][0-9a-fA-F]{1,8}"/> <!-- base 16 -->
-        <xs:pattern value="0[bB][0-1]{1,32}"/> <!-- base 1 -->
+        <xs:pattern value="\d{1,20}"/> <!-- base 10 int -->
+        <xs:pattern value="0[xX][0-9a-fA-F]{1,16}"/> <!-- base 16 -->
+        <xs:pattern value="0[bB][0-1]{1,64}"/> <!-- base 1 -->
         <xs:pattern value="NaN"/> <!-- Allow not-a-number as a default (for params) -->
     </xs:restriction>
   </xs:simpleType>