diff --git a/quickfixj-core/src/test/java/quickfix/RepeatingGroupTest.java b/quickfixj-core/src/test/java/quickfix/RepeatingGroupTest.java
index cc189cb770..4e611e8e0d 100644
--- a/quickfixj-core/src/test/java/quickfix/RepeatingGroupTest.java
+++ b/quickfixj-core/src/test/java/quickfix/RepeatingGroupTest.java
@@ -521,7 +521,7 @@ public void testIgnoreOutOfOrderGroupMembers() throws Exception {
         final Message m = new Message(
             "8=FIX.4.4\0019=0\00135=D\00134=2\00149=TW\00152=20080203-00:29:51.453\00156=ISLD\001" +
             "11=ID\00121=1\00140=1\00154=1\00138=200.00\00155=INTC\00178=2\00179=acct1\00180=50\001" +
-            "661=10\00179=acct2\00180=150\001661=11\00160=20080203-00:29:51.453\00110=000\001",
+            "661=1\00179=acct2\00180=150\001661=2\00160=20080203-00:29:51.453\00110=000\001",
             defaultDataDictionary, ignoreOutOfOrderSettings,false);
         try {
             defaultDataDictionary.validate(m, ignoreOutOfOrderSettings);
diff --git a/quickfixj-core/src/test/resources/FIX44_Custom_Test.xml b/quickfixj-core/src/test/resources/FIX44_Custom_Test.xml
index 5585f8346f..3e0e6fe0c2 100644
--- a/quickfixj-core/src/test/resources/FIX44_Custom_Test.xml
+++ b/quickfixj-core/src/test/resources/FIX44_Custom_Test.xml
@@ -5936,7 +5936,14 @@
       <value enum="4" description="OMGEO" />
       <value enum="5" description="DTCC_CODE" />
     </field>
-    <field number="661" name="AllocAcctIDSource" type="INT" />
+    <field number="661" name="AllocAcctIDSource" type="INT">
+      <value enum="1" description="BIC"/>
+      <value enum="2" description="SID_CODE"/>
+      <value enum="3" description="TFM"/>
+      <value enum="4" description="OMGEO"/>
+      <value enum="5" description="DTCC_CODE"/>
+      <value enum="99" description="OTHER"/>
+    </field>
     <field number="662" name="BenchmarkPrice" type="PRICE" />
     <field number="663" name="BenchmarkPriceType" type="INT" />
     <field number="664" name="ConfirmID" type="STRING" />
diff --git a/quickfixj-messages/quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml b/quickfixj-messages/quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml
index 6ebb434278..434f6e3688 100644
--- a/quickfixj-messages/quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml
+++ b/quickfixj-messages/quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml
@@ -6057,7 +6057,14 @@
       <value enum="5" description="DTCC_CODE"/>
       <value enum="99" description="OTHER"/>
     </field>
-    <field number="661" name="AllocAcctIDSource" type="INT"/>
+    <field number="661" name="AllocAcctIDSource" type="INT">
+      <value enum="1" description="BIC"/>
+      <value enum="2" description="SID_CODE"/>
+      <value enum="3" description="TFM"/>
+      <value enum="4" description="OMGEO"/>
+      <value enum="5" description="DTCC_CODE"/>
+      <value enum="99" description="OTHER"/>
+    </field>
     <field number="662" name="BenchmarkPrice" type="PRICE"/>
     <field number="663" name="BenchmarkPriceType" type="INT"/>
     <field number="664" name="ConfirmID" type="STRING"/>
diff --git a/quickfixj-messages/quickfixj-messages-fix44/src/main/resources/FIX44.xml b/quickfixj-messages/quickfixj-messages-fix44/src/main/resources/FIX44.xml
index 248d55776c..84bbcaf726 100644
--- a/quickfixj-messages/quickfixj-messages-fix44/src/main/resources/FIX44.xml
+++ b/quickfixj-messages/quickfixj-messages-fix44/src/main/resources/FIX44.xml
@@ -6051,7 +6051,14 @@
       <value enum="5" description="DTCC_CODE"/>
       <value enum="99" description="OTHER"/>
     </field>
-    <field number="661" name="AllocAcctIDSource" type="INT"/>
+    <field number="661" name="AllocAcctIDSource" type="INT">
+      <value enum="1" description="BIC"/>
+      <value enum="2" description="SID_CODE"/>
+      <value enum="3" description="TFM"/>
+      <value enum="4" description="OMGEO"/>
+      <value enum="5" description="DTCC_CODE"/>
+      <value enum="99" description="OTHER"/>
+    </field>
     <field number="662" name="BenchmarkPrice" type="PRICE"/>
     <field number="663" name="BenchmarkPriceType" type="INT"/>
     <field number="664" name="ConfirmID" type="STRING"/>
diff --git a/quickfixj-messages/quickfixj-messages-fix50/src/main/resources/FIX50.xml b/quickfixj-messages/quickfixj-messages-fix50/src/main/resources/FIX50.xml
index 023808c208..b32144cd02 100644
--- a/quickfixj-messages/quickfixj-messages-fix50/src/main/resources/FIX50.xml
+++ b/quickfixj-messages/quickfixj-messages-fix50/src/main/resources/FIX50.xml
@@ -6857,7 +6857,14 @@
       <value enum="5" description="DTCC_CODE"/>
       <value enum="99" description="OTHER"/>
     </field>
-    <field number="661" name="AllocAcctIDSource" type="INT"/>
+    <field number="661" name="AllocAcctIDSource" type="INT">
+      <value enum="1" description="BIC"/>
+      <value enum="2" description="SID_CODE"/>
+      <value enum="3" description="TFM"/>
+      <value enum="4" description="OMGEO"/>
+      <value enum="5" description="DTCC_CODE"/>
+      <value enum="99" description="OTHER"/>
+    </field>
     <field number="662" name="BenchmarkPrice" type="PRICE"/>
     <field number="663" name="BenchmarkPriceType" type="INT"/>
     <field number="664" name="ConfirmID" type="STRING"/>
diff --git a/quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml b/quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml
index f7a4fdde20..102cde3211 100644
--- a/quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml
+++ b/quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml
@@ -7599,7 +7599,14 @@
       <value enum="5" description="DTCC_CODE"/>
       <value enum="99" description="OTHER"/>
     </field>
-    <field number="661" name="AllocAcctIDSource" type="INT"/>
+    <field number="661" name="AllocAcctIDSource" type="INT">
+      <value enum="1" description="BIC"/>
+      <value enum="2" description="SID_CODE"/>
+      <value enum="3" description="TFM"/>
+      <value enum="4" description="OMGEO"/>
+      <value enum="5" description="DTCC_CODE"/>
+      <value enum="99" description="OTHER"/>
+    </field>
     <field number="662" name="BenchmarkPrice" type="PRICE"/>
     <field number="663" name="BenchmarkPriceType" type="INT"/>
     <field number="664" name="ConfirmID" type="STRING"/>
diff --git a/quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.xml b/quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.xml
index 62a7d5571e..6cef9b8fb5 100644
--- a/quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.xml
+++ b/quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.xml
@@ -7593,7 +7593,14 @@
       <value enum="5" description="DTCC_CODE"/>
       <value enum="99" description="OTHER"/>
     </field>
-    <field number="661" name="AllocAcctIDSource" type="INT"/>
+    <field number="661" name="AllocAcctIDSource" type="INT">
+      <value enum="1" description="BIC"/>
+      <value enum="2" description="SID_CODE"/>
+      <value enum="3" description="TFM"/>
+      <value enum="4" description="OMGEO"/>
+      <value enum="5" description="DTCC_CODE"/>
+      <value enum="99" description="OTHER"/>
+    </field>
     <field number="662" name="BenchmarkPrice" type="PRICE"/>
     <field number="663" name="BenchmarkPriceType" type="INT"/>
     <field number="664" name="ConfirmID" type="STRING"/>
diff --git a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
index 069cf4837b..e1e5bb7578 100644
--- a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
+++ b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
@@ -7863,7 +7863,14 @@
       <value enum="5" description="DTCC_CODE"/>
       <value enum="99" description="OTHER"/>
     </field>
-    <field number="661" name="AllocAcctIDSource" type="INT"/>
+    <field number="661" name="AllocAcctIDSource" type="INT">
+      <value enum="1" description="BIC"/>
+      <value enum="2" description="SID_CODE"/>
+      <value enum="3" description="TFM"/>
+      <value enum="4" description="OMGEO"/>
+      <value enum="5" description="DTCC_CODE"/>
+      <value enum="99" description="OTHER"/>
+    </field>
     <field number="662" name="BenchmarkPrice" type="PRICE"/>
     <field number="663" name="BenchmarkPriceType" type="INT"/>
     <field number="664" name="ConfirmID" type="STRING"/>
diff --git a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.xml b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.xml
index 07609c5767..e75c3e5ac5 100644
--- a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.xml
+++ b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.xml
@@ -7857,7 +7857,14 @@
       <value enum="5" description="DTCC_CODE"/>
       <value enum="99" description="OTHER"/>
     </field>
-    <field number="661" name="AllocAcctIDSource" type="INT"/>
+    <field number="661" name="AllocAcctIDSource" type="INT">
+      <value enum="1" description="BIC"/>
+      <value enum="2" description="SID_CODE"/>
+      <value enum="3" description="TFM"/>
+      <value enum="4" description="OMGEO"/>
+      <value enum="5" description="DTCC_CODE"/>
+      <value enum="99" description="OTHER"/>
+    </field>
     <field number="662" name="BenchmarkPrice" type="PRICE"/>
     <field number="663" name="BenchmarkPriceType" type="INT"/>
     <field number="664" name="ConfirmID" type="STRING"/>