diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 5bc5602b..7ebb7379 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-04  Arnim Laeuger  <arniml>
+
+  * src/bsdl/bsdl_flex.l: force Base = DECIMAL for BOUNDARY_LENGTH attribute
+
 2009-05-26  Arnim Laeuger  <arniml>
 
   * src/bus/bf561_ezkit.c, src/bus/sharc21065l.c, src/bus/bf537_stamp.c,
diff --git a/jtag/src/bsdl/bsdl_flex.l b/jtag/src/bsdl/bsdl_flex.l
index d93a82cc..6d0d39d8 100644
--- a/jtag/src/bsdl/bsdl_flex.l
+++ b/jtag/src/bsdl/bsdl_flex.l
@@ -291,7 +291,7 @@ ISC_Illegal_Exit      ISC_ILLEGAL_EXIT
 {Instruction_Private}   {return( INSTRUCTION_PRIVATE ); }
 {Register_Access}       {BEGIN(REG); yyextra->Base = DECIMAL;
                          return( REGISTER_ACCESS ); }
-{Boundary_Length}       {return( BOUNDARY_LENGTH ); }
+{Boundary_Length}       {yyextra->Base = DECIMAL; return( BOUNDARY_LENGTH ); }
 {Boundary_Register}     {BEGIN(BOU); yyextra->Base = DECIMAL;
                          return( BOUNDARY_REGISTER ); }
 {Idcode_Register}       {yyextra->Base = BIN_X; return( IDCODE_REGISTER ); }
diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index f9a93180..2bf66970 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-04  Arnim Laeuger  <arniml>
+
+  * src/bsdl/bsdl_flex.l: force Base = DECIMAL for BOUNDARY_LENGTH attribute
+
 2009-06-04  Rutger Hofman <rfhh>
 
   * src/tap/cable/*.c, src/tap/parport/*.c, src/tap/usbconn/*.c: return/handle
diff --git a/urjtag/src/bsdl/bsdl_flex.l b/urjtag/src/bsdl/bsdl_flex.l
index 4edbcfd0..48043076 100644
--- a/urjtag/src/bsdl/bsdl_flex.l
+++ b/urjtag/src/bsdl/bsdl_flex.l
@@ -291,7 +291,7 @@ ISC_Illegal_Exit      ISC_ILLEGAL_EXIT
 {Instruction_Private}   {return( INSTRUCTION_PRIVATE ); }
 {Register_Access}       {BEGIN(REG); yyextra->Base = DECIMAL;
                          return( REGISTER_ACCESS ); }
-{Boundary_Length}       {return( BOUNDARY_LENGTH ); }
+{Boundary_Length}       {yyextra->Base = DECIMAL; return( BOUNDARY_LENGTH ); }
 {Boundary_Register}     {BEGIN(BOU); yyextra->Base = DECIMAL;
                          return( BOUNDARY_REGISTER ); }
 {Idcode_Register}       {yyextra->Base = BIN_X; return( IDCODE_REGISTER ); }