diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ea8efd6722..4ea50514b3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-28 00:19 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/rddsql/sddoci/sddoci.c
+    ! Fixed handling of dates.
+
 2010-02-27 11:40 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/generator/hbqtgen.prg
     ! Introduced $EXTERNALLINK$ tag.
@@ -88,7 +92,7 @@
     ; Not being an Oracle user, I only have the few sample
       tables, so no testing was made with these types.
     ; TOFIX: decimal position retrieval is currently wrong.
-    ; TOFIX: date/time/timestamp doesn't seem to get through.
+    ; TOFIX: date/time/timestamp doesn't seem to get through. [DONE]
 
   * config/win/global.mk
   * config/rules.mk
diff --git a/harbour/contrib/rddsql/sddoci/sddoci.c b/harbour/contrib/rddsql/sddoci/sddoci.c
index 8bf3c6a6cf..a6cb90b929 100644
--- a/harbour/contrib/rddsql/sddoci/sddoci.c
+++ b/harbour/contrib/rddsql/sddoci/sddoci.c
@@ -593,9 +593,10 @@ static HB_ERRCODE ocilibGoTo( SQLBASEAREAP pArea, HB_ULONG ulRecNo )
             case HB_FT_TIME:
             {
                OCI_Date * date = OCI_GetDate( rs, ui );
-               int iHour, iMin, iSec;
-               if( date && OCI_DateGetTime( date, &iHour, &iMin, &iSec ) )
-                  pItem = hb_itemPutTDT( NULL, 0,
+               int iYear, iMonth, iDay, iHour, iMin, iSec;
+
+               if( date && OCI_DateGetDateTime( date, &iYear, &iMonth, &iDay, &iHour, &iMin, &iSec ) )
+                  pItem = hb_itemPutTDT( NULL, hb_dateEncode( iYear, iMonth, iDay ),
                                          hb_timeEncode( iHour, iMin, iSec, 0 ) );
                break;
             }