diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9800d5ac90..e9563f7d20 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2004-07-26 01:21 UTC+0100 Antonio Linares <alinares@fivetechsoft.com>
+  + source/rtl/scalar.prg
+    * Harbour implementation of Class(y) Class ScalarObject
+
+  * makefile.bc
+    + Added module scalar.prg
+
+  WARNING: Other makefiles need to be updated.
+
 2004-07-25 16:48 UTC+0100 Antonio Linares <alinares@fivetechsoft.com>
   * vm/classes.c
     + functions hb_clsCreate(), hb_clsAdd() and hb_clsAssociate() added.
@@ -308,7 +317,7 @@
 
    * source/rtl/persist.prg
       * fixed to not use xBase extensions
-      
+
 
 2004-05-13 11:00 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
 
@@ -322,17 +331,17 @@
       point
       e.g. -1230. was displayed as -123-.
       * fixed support for '9999.' picture
-      
-      
+
+
 2004-05-11 15:10 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
 
    * CVSROOT/avail
-      * restored write access to the entire repository for 
+      * restored write access to the entire repository for
       all developers
-      
+
    * doc/codestyl.txt
       * small corrections (use 3 spaces instead of Tab)
-      
+
    * include/hbcomp.h
    * source/compiler/cmdcheck.c
    * source/compiler/harbour.c
@@ -345,7 +354,7 @@
    * source/rtl/tget.prg
       * fixed positioning of cursor when the first pressed key
       was a digit during editing of numeric value
-      
+
    * source/compiler/hbfix.c
    * source/rdd/dbcmd.c
    * source/rdd/dbf1.c
@@ -390,7 +399,7 @@
    + config/dos/owatcom.cf
       * added configuration file for OpenWatcom (renamed
       from watcom.cf)
-      
+
    * config/dos/watcom.cf
       * restored previous version so it correctly compiles
       under WatcomC 10 - please use watcom.cf for WatcomC
@@ -399,40 +408,40 @@
    * makefile.bc
    * makefile.nt
    * makefile.vc
-   * hrbdll.bc      
+   * hrbdll.bc
    * source/codepage/Makefile
    + source/codepage/cdpsrwin.c
       + new file with Serbian codepage
 
    * CVSROOT/avail
       * removed reference to my local file
-      
+
    * ERRATA
       * updated (removed reference to tmpname)
-      
+
    * doc/codestyl.txt
       * updated with some coding guidelines adopted from PHP
       (please fell free to discuss them ;-)
-      
+
    * doc/howtocvs.txt
       * added description for commit on Linux
-      
+
    * include/hbapicdp.h
    * source/codepage/cdpesdos.c
       * restored previous versions
-      
+
    * include/hbcomp.h
       * added <malloc.h> reference for WatcomC compiler
-      
+
    * include/hbexprc.c
       * fixed warning reported by WatcomC
 
    * source/vm/itemapi.c
       * fixed infinite support for WatcomC
-      
+
    * source/rtl/cdpapi.c
       * renamed global symbol s_cdpage into hb_cdp_page
-      
+
    * source/rtl/gtcrs/kbdcrs.c
       * fixed reporting keystrokes with codes > 127
 
@@ -446,7 +455,7 @@
    * CVSROOT/checkoutlist
    * CVSROOT/commitinfo
    * CVSROOT/loginfo
-      + access to CVSROOT files is now available for 
+      + access to CVSROOT files is now available for
       project admins only
 
 2004-05-06 15:40 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
@@ -481,12 +490,12 @@
       into cvs.sourceforge.net
 
 2004-04-30 16:09 UTC+0200 Ilias Lazaridis <ilias@lazaridis.com>
-   + /cvsplay.txt 
-     + Added file with tortoiseCVS to check CVS 
+   + /cvsplay.txt
+     + Added file with tortoiseCVS to check CVS
        functionality without influencing rest of project
 
    [Note: the above changelog time entry is possibly not correct]
-   
+
 
 2004-04-27 12:57 UTC-0500 Randy Portnoff <randy@palmasdev.com>
 
@@ -711,15 +720,15 @@
 2004-04-02 16:25 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
    * source/compiler/gencli.c
       * fixed warnings
-      
+
    * source/rtl/cdpapi.c
       *fixed warnings (Can the author of the code check if
       I correctly parenthesized multiple || and && conditions?)
-      
+
    * source/vm/classes.c
-      *fixed warning in gcc (commented out unused 
+      *fixed warning in gcc (commented out unused
       static hb_clsScope function)
-      
+
    * source/rdd/dbfntx/dbfntx1.c
    * source/rtl/fstemp.c
       * fixed hb_fsCreateTemp() to use 'mkstemp' on Unix
@@ -728,7 +737,7 @@
 
    * source/rtl/set.c
       *hb_set.HB_SET_DIRSEPARATOR defaults to '/' on Unix
-      
+
 
 2004-04-02 13:15 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
    * include/hbexpra.c
@@ -747,7 +756,7 @@
 
    * source/rtl/filesys.c
    * source/rdd/hbdbsort.c
-      * fixed to suppres warnings 
+      * fixed to suppres warnings
 
    * source/pp/ppcore.c
    * utils/hbtest/rt_misc.prg