diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c8117c871e..5c64219515 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-21 14:28 UTC+0500 April White (april users.sourceforge.net)
+  * contrib/hbbtree/hb_btree.c
+    * store a const to a var to be written to file in place of
+      writing the const to the file via a cast
+    * typo fix: store 16-bit numbers as 32-bit numbers within the file
+
 2009-12-21 14:38 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbwince.h
     + added hack for missing GetEnvironmentVariable?() declarations in
diff --git a/harbour/contrib/hbbtree/hb_btree.c b/harbour/contrib/hbbtree/hb_btree.c
index 9237824501..1122c63a6f 100644
--- a/harbour/contrib/hbbtree/hb_btree.c
+++ b/harbour/contrib/hbbtree/hb_btree.c
@@ -589,6 +589,7 @@ static void HeaderWrite( struct hb_BTree * pBTree )
 {
    BYTE TmpHeader[ HB_BTREE_HEADERSIZE ];
    BYTE * pHeader = &TmpHeader[ 0 ];
+   UINT32 uiHeaderSize = HB_BTREE_HEADERSIZE;
 
   /*
     header       [4 bytes]
@@ -602,11 +603,11 @@ static void HeaderWrite( struct hb_BTree * pBTree )
 
    hb_xmemset( TmpHeader, '\0', sizeof( TmpHeader ) );
 
-   #define put_uint16( v, p ) { HB_PUT_LE_UINT16( p, ( UINT32 )v ); p += 4; }
+   #define put_uint16( v, p ) { HB_PUT_LE_UINT32( p, ( UINT32 ) v ); p += 4; }
    #define put_uint32( v, p ) { HB_PUT_LE_UINT32( p, v ); p += 4; }
 
    hb_xmemcpy( pHeader, HEADER_ID, sizeof( HEADER_ID ) - 1 ); pHeader += sizeof( HEADER_ID ) - 1;
-   put_uint32( ( UINT32 )HB_BTREE_HEADERSIZE, pHeader );
+   put_uint32( uiHeaderSize, pHeader );
    put_uint16( pBTree->usPageSize, pHeader );
    put_uint16( pBTree->usKeySize , pHeader );
    put_uint16( pBTree->usMaxKeys, pHeader );