diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e32f4e8c30..817f7881e4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-09 10:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * source/rtl/gtwvt/gtwvt.c
+   * contrib/gtwvg/gtwvg.c
+     ! Restored previous change.
+       In Harbour, passing NULL to hb_itemPutC() is valid and 
+       will result in an empty string being stored in an optimized way.
+       hb_itemPutCLPtr() should be used instead of hb_itemPutCPtr().
+       The GPF in question used to happen when setting the clipboard, 
+       and it looks to happen inside the OS. I'm still investigating.
+
+   * contrib/hbapollo/tests/bld_b32.bat
+   * contrib/hbapollo/tests/bld_vc.bat
+     ! Fixed external .lib name.
+
 2008-07-08 16:45 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/gtwvg/gtwvg.c
   * source/rtl/gtwvt/gtwvt.c
diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c
index 83494cde0b..3062601202 100644
--- a/harbour/contrib/gtwvg/gtwvg.c
+++ b/harbour/contrib/gtwvg/gtwvg.c
@@ -2472,7 +2472,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
             }
             else
             {
-               pInfo->pResult = hb_itemPutC( pInfo->pResult, "" );
+               pInfo->pResult = hb_itemPutC( pInfo->pResult, NULL );
             }
          }
          break;
diff --git a/harbour/contrib/hbapollo/tests/bld_b32.bat b/harbour/contrib/hbapollo/tests/bld_b32.bat
index 720381c9e3..045d2c5f7e 100644
--- a/harbour/contrib/hbapollo/tests/bld_b32.bat
+++ b/harbour/contrib/hbapollo/tests/bld_b32.bat
@@ -9,6 +9,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
 
 set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
-set HB_USER_LIBS=hbapollo.lib sde60.lib
+set HB_USER_LIBS=hbapollo.lib sde61.lib
 
 call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbapollo/tests/bld_vc.bat b/harbour/contrib/hbapollo/tests/bld_vc.bat
index a409ac85ca..f0ce72dc05 100644
--- a/harbour/contrib/hbapollo/tests/bld_vc.bat
+++ b/harbour/contrib/hbapollo/tests/bld_vc.bat
@@ -9,6 +9,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
 
 set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
-set HB_USER_LIBS=hbapollo.lib sde60.lib
+set HB_USER_LIBS=hbapollo.lib sde61.lib
 
 call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c
index b654846c54..b53475351b 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -2113,13 +2113,13 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
                                         CF_OEMTEXT : CF_TEXT,
                                         &szClipboardData, &ulLen ) )
             {
-               pInfo->pResult = hb_itemPutCPtr( pInfo->pResult,
+               pInfo->pResult = hb_itemPutCLPtr( pInfo->pResult,
                                                  szClipboardData,
                                                  ulLen );
             }
             else
             {
-               pInfo->pResult = hb_itemPutC( pInfo->pResult, "" );
+               pInfo->pResult = hb_itemPutC( pInfo->pResult, NULL );
             }
          }
          break;