diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 85ddb424f2..6a4e5b95da 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-06 16:05 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
+  * harbour/contrib/rddsql/sqlbase.c
+    ! fixed double memory freeing and GPF. Thanks valgrind!
+
 2009-05-06 14:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     ! Further fixes to .po file handling functionality after real
diff --git a/harbour/contrib/rddsql/sqlbase.c b/harbour/contrib/rddsql/sqlbase.c
index 4ee75fddab..35ba603f66 100644
--- a/harbour/contrib/rddsql/sqlbase.c
+++ b/harbour/contrib/rddsql/sqlbase.c
@@ -492,8 +492,10 @@ static HB_ERRCODE sqlbaseClose( SQLBASEAREAP pArea )
    }
 
    if ( pArea->szQuery )
-     hb_xfree( pArea->szQuery );
-
+   {
+      hb_xfree( pArea->szQuery );
+      pArea->szQuery = NULL;
+   }
    return HB_SUCCESS;
 }