diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1bd9532862..1f9280c09c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-03-28 14:18 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * src/rtl/fslink.c
+    % using HB_TCHAR_COPYFROM() macro instead of locally rolled
+      (equivalent) logic.
+
 2012-03-28 11:25 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbhpdf/3rd/libhpdf/hpdfcfg.h
     ! stripped unused (as of 2.2.1) and potentially misleading libharu
diff --git a/harbour/src/rtl/fslink.c b/harbour/src/rtl/fslink.c
index ab01ec797c..9eeb8e8b07 100644
--- a/harbour/src/rtl/fslink.c
+++ b/harbour/src/rtl/fslink.c
@@ -252,11 +252,7 @@ char * hb_fsLinkRead( const char * pszFile )
                   if( size > 0 )
                   {
                      pszLink = ( char * ) hb_xgrab( size + 1 );
-#if defined( UNICODE )
-                     hb_wcntombcpy( pszLink, lpLink, ( HB_SIZE ) size );
-#else
-                     hb_strncpy( pszLink, lpLink, ( HB_SIZE ) size );
-#endif
+                     HB_TCHAR_COPYFROM( pszLink, lpLink, ( HB_SIZE ) size );
                   }
                   else
                      pszLink = NULL;