diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 521f2386a4..b78520a08c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-10 18:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbclass.ch
+    ! added missing TIMESTAMP class to ASSOCIATE CLASS command,
+      thanks to Alex Strickland for the information
+
 2010-06-10 14:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/plug_moc.prg
   * utils/hbmk2/hbmk2.prg
diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch
index b200209ea2..0b81b555c7 100644
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -598,7 +598,7 @@ DECLARE HBClass ;
 
 /* Scalar classes support */
 #command ASSOCIATE CLASS <ClassFuncName> WITH TYPE <type: ;
-   ARRAY, BLOCK, CHARACTER, DATE, HASH, LOGICAL, NIL, NUMERIC, SYMBOL, POINTER> => ;
+   ARRAY, BLOCK, CHARACTER, DATE, HASH, LOGICAL, NIL, NUMERIC, SYMBOL, TIMESTAMP, POINTER> => ;
       __clsAssocType( __clsInstSuper( @<ClassFuncName>() ), #<type> )
 
 #command ENABLE TYPE CLASS <type: ;