diff --git a/ChangeLog.txt b/ChangeLog.txt
index dd4eb39c37..e9061c078d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,27 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2021-04-12 21:18 UTC+0200 Aleksander Czajczynski (hb fki.pl)
+  * src/rtl/hbfilehi.prg
+    * hb_DirBuild() will now honor UNC "\\server\share\dir\tree" parameter
+      on Windows and correctly create specified "\dir\tree" on remote
+      server. If your code used a malformed "\\local\path" a regression
+      in .prg code may happen on Windows. Previously a "\local\path"
+      folder was created on current drive, as if the UNC specifier was
+      omitted. It was more or less consistent with other platforms but
+      not expected for this platform. Spotted by Maurizio la Cecilia (#233)
+      [INCOMPATIBLE] 
+
+  * contrib/hbdoc/hbdoc.prg
+  * contrib/hbformat/utils/hbformat.prg
+  * contrib/hbnetio/utils/hbnetio/hbnetio.prg
+  * package/harbour.mft
+  * package/harbour.rc
+  * src/compiler/hbusage.c
+  * utils/hbi18n/hbi18n.prg
+  * utils/hbtest/hbtest.prg
+    * bumped copyright year to 2021
+    
 2021-04-10 23:32 UTC+0200 Aleksander Czajczynski (hb fki.pl)
   * contrib/hbfbird/firebird.c
     + added optional <cCollate> as 7-th parameter of FBCREATEDB( <cDB>,
diff --git a/contrib/hbdoc/hbdoc.prg b/contrib/hbdoc/hbdoc.prg
index b959c02665..cd17e0b8be 100644
--- a/contrib/hbdoc/hbdoc.prg
+++ b/contrib/hbdoc/hbdoc.prg
@@ -768,7 +768,7 @@ STATIC PROCEDURE ShowHelp( cExtraMessage, aArgs )
       aHelp := { ;
          cExtraMessage, ;
          "Harbour Document Compiler (hbdoc) " + HBRawVersion(), ;
-         "Copyright (c) 1999-2020, " + hb_Version( HB_VERSION_URL_BASE ), ;
+         "Copyright (c) 1999-2021, " + hb_Version( HB_VERSION_URL_BASE ), ;
          "", ;
          "Syntax:", ;
          "", ;
diff --git a/contrib/hbformat/utils/hbformat.prg b/contrib/hbformat/utils/hbformat.prg
index 197d0f702b..e99cbd13ca 100644
--- a/contrib/hbformat/utils/hbformat.prg
+++ b/contrib/hbformat/utils/hbformat.prg
@@ -160,7 +160,7 @@ STATIC PROCEDURE About()
    OutStd( ;
       "Harbour Source Formatter " + HBRawVersion() + hb_eol() + ;
       "Copyright (c) 2010-" + ;
-         "2020" + ", " + ;
+         "2021" + ", " + ;
          hb_Version( HB_VERSION_URL_BASE ) + hb_eol() + ;
       "Copyright (c) 2009, Alexander S.Kresin" + hb_eol() + ;
       hb_eol() )
diff --git a/package/harbour.mft b/package/harbour.mft
index 14ffbebf01..c6f27be88e 100644
--- a/package/harbour.mft
+++ b/package/harbour.mft
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright © 1999-2020 (see application banner) -->
+<!-- Copyright © 1999-2021 (see application banner) -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
     version="3.2.0.0"
diff --git a/package/harbour.rc b/package/harbour.rc
index 03b56c3bbc..a9990ee53f 100644
--- a/package/harbour.rc
+++ b/package/harbour.rc
@@ -11,7 +11,7 @@
 #define HB_VER_FILEVERSION_STR         HB_VER_PRODUCTVERSION_STR
 
 #define HB_NAME                        "Harbour\0"
-#define HB_COPYRIGHT                   "Copyright \xA9 1999-2020 (see application banner)\0"
+#define HB_COPYRIGHT                   "Copyright \xA9 1999-2021 (see application banner)\0"
 
 /* Version info */
 
diff --git a/src/compiler/hbusage.c b/src/compiler/hbusage.c
index f23c57da98..5a0160efbc 100644
--- a/src/compiler/hbusage.c
+++ b/src/compiler/hbusage.c
@@ -261,7 +261,7 @@ void hb_compPrintLogo( HB_COMP_DECL )
 {
    char * szVer = hb_verHarbour();
 
-   #define HB_VER_COMMIT_YEAR  "2020"
+   #define HB_VER_COMMIT_YEAR  "2021"
    #define HB_VER_ORIGIN_URL   "https://harbour.github.io/"
 
    hb_compOutStd( HB_COMP_PARAM, szVer );
diff --git a/src/rtl/hbfilehi.prg b/src/rtl/hbfilehi.prg
index 49000b0c7c..14d055fe6d 100644
--- a/src/rtl/hbfilehi.prg
+++ b/src/rtl/hbfilehi.prg
@@ -284,6 +284,11 @@ FUNCTION hb_DirBuild( cDir )
          ( tmp := At( hb_osDriveSeparator(), cDir ) ) > 0
          cDirTemp := Left( cDir, tmp )
          cDir := SubStr( cDir, tmp + 1 )
+#ifdef __PLATFORM__WINDOWS
+      ELSEIF Left( cDir, 2 ) == "\\" /* UNC Path, network share */
+         cDirTemp := Left( cDir, hb_At( "\", cDir, 3 ) )
+         cDir := SubStr( cDir, Len( cDirTemp ) + 1 )
+#endif
       ELSEIF Left( cDir, 1 ) == hb_ps()
          cDirTemp := Left( cDir, 1 )
          cDir := SubStr( cDir, 2 )
diff --git a/utils/hbi18n/hbi18n.prg b/utils/hbi18n/hbi18n.prg
index 4283175068..b5d7dd4a08 100644
--- a/utils/hbi18n/hbi18n.prg
+++ b/utils/hbi18n/hbi18n.prg
@@ -168,7 +168,7 @@ STATIC PROCEDURE Logo()
    OutStd( ;
       "Harbour i18n .pot/.hbl file manager " + HBRawVersion() + hb_eol() + ;
       "Copyright (c) 2009-" + ;
-         "2020" + ", " + ;
+         "2021" + ", " + ;
          "Przemyslaw Czerpak" + hb_eol() + ;
       hb_Version( HB_VERSION_URL_BASE ) + hb_eol() + ;
       hb_eol() )
diff --git a/utils/hbtest/hbtest.prg b/utils/hbtest/hbtest.prg
index 12fb2c2cf0..8a92e9b6cb 100644
--- a/utils/hbtest/hbtest.prg
+++ b/utils/hbtest/hbtest.prg
@@ -95,7 +95,7 @@ STATIC s_lDBFAvail := .F.
    ANNOUNCE HB_GTSYS
    REQUEST HB_GT_CGI_DEFAULT
 
-   #define COPYRIGHT_YEAR  "2020"
+   #define COPYRIGHT_YEAR  "2021"
 #else
    #define COPYRIGHT_YEAR  "present"