diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5d99c0e102..337e365e41 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,15 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-02-17 17:44 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * package/harb_win.mft
+  * package/harb_win.rc
+    * bumped copyright year to 2015
+
+  * package/mpkg_win_nightly.bat
+  * package/winuni/mpkg_win_uni.bat
+    * enclosed paths in "" for names with spaces
+
 2015-02-17 17:22 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/rdd/dbf1.c
     * modified code which tries to detect if field flags were used in DBF
diff --git a/package/harb_win.mft b/package/harb_win.mft
index 7a03b33cfd..16c58f275f 100644
--- a/package/harb_win.mft
+++ b/package/harb_win.mft
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright © 1999-2013 (see application banner) -->
+<!-- Copyright © 1999-2015 (see application banner) -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
     version="3.2.0.0"
diff --git a/package/harb_win.rc b/package/harb_win.rc
index b23a67d0a3..dd06281360 100644
--- a/package/harb_win.rc
+++ b/package/harb_win.rc
@@ -14,7 +14,7 @@
 #define HB_VER_FILEVERSION_STR         HB_VER_PRODUCTVERSION_STR
 
 #define HB_NAME                        "Harbour\0"
-#define HB_COPYRIGHT                   "Copyright \xA9 1999-2013 (see application banner)\0"
+#define HB_COPYRIGHT                   "Copyright \xA9 1999-2015 (see application banner)\0"
 
 /* Version info */
 
diff --git a/package/mpkg_win_nightly.bat b/package/mpkg_win_nightly.bat
index d89b4b33a8..507f4b8def 100644
--- a/package/mpkg_win_nightly.bat
+++ b/package/mpkg_win_nightly.bat
@@ -26,7 +26,7 @@ rem ---------------------------------------------------------------
 
 pushd
 
-cd %~dp0
+cd "%~dp0"
 
 echo ! Self: %0
 
@@ -38,10 +38,10 @@ echo ! Downloading Harbour sources...
 
 if exist core-master rd /q /s core-master
 del master.
-%_HB_DIR_TOOL%wget --no-check-certificate https://github.com/harbour/core/archive/master.zip
+"%_HB_DIR_TOOL%wget" --no-check-certificate https://github.com/harbour/core/archive/master.zip
 if errorlevel 1 goto _EXIT
 
-%_HB_DIR_TOOL%unzip master.
+"%_HB_DIR_TOOL%unzip" master.
 cd core-master
 
 echo ! Setting up generic build parameters...
@@ -103,12 +103,12 @@ rem endlocal
 
 rem echo ! Uploading Harbour Windows binaries...
 rem
-rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-mingw.exe  %HB_SFNET_USER%%_HB_SFNET_URL%
-rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-mingw.zip  %HB_SFNET_USER%%_HB_SFNET_URL%
-rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-bcc.exe    %HB_SFNET_USER%%_HB_SFNET_URL%
-rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-bcc.zip    %HB_SFNET_USER%%_HB_SFNET_URL%
-rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-watcom.exe %HB_SFNET_USER%%_HB_SFNET_URL%
-rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-watcom.zip %HB_SFNET_USER%%_HB_SFNET_URL%
+rem "%_HB_DIR_TOOL%pscp.exe" -i "%HB_SFNET_FRS_PRIVATE_KEY%" harbour-nightly-win-mingw.exe  %HB_SFNET_USER%%_HB_SFNET_URL%
+rem "%_HB_DIR_TOOL%pscp.exe" -i "%HB_SFNET_FRS_PRIVATE_KEY%" harbour-nightly-win-mingw.zip  %HB_SFNET_USER%%_HB_SFNET_URL%
+rem "%_HB_DIR_TOOL%pscp.exe" -i "%HB_SFNET_FRS_PRIVATE_KEY%" harbour-nightly-win-bcc.exe    %HB_SFNET_USER%%_HB_SFNET_URL%
+rem "%_HB_DIR_TOOL%pscp.exe" -i "%HB_SFNET_FRS_PRIVATE_KEY%" harbour-nightly-win-bcc.zip    %HB_SFNET_USER%%_HB_SFNET_URL%
+rem "%_HB_DIR_TOOL%pscp.exe" -i "%HB_SFNET_FRS_PRIVATE_KEY%" harbour-nightly-win-watcom.exe %HB_SFNET_USER%%_HB_SFNET_URL%
+rem "%_HB_DIR_TOOL%pscp.exe" -i "%HB_SFNET_FRS_PRIVATE_KEY%" harbour-nightly-win-watcom.zip %HB_SFNET_USER%%_HB_SFNET_URL%
 
 echo ! Creating unified Windows package...
 
@@ -116,15 +116,15 @@ call package\winuni\mpkg_win_uni.bat
 
 echo ! Uploading Harbour unified Windows package...
 
-%_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win.exe            %HB_SFNET_USER%%_HB_SFNET_URL%
-%_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win.7z             %HB_SFNET_USER%%_HB_SFNET_URL%
+"%_HB_DIR_TOOL%pscp.exe -i" "%HB_SFNET_FRS_PRIVATE_KEY%" "%HB_RT%harbour-nightly-win.exe"            %HB_SFNET_USER%%_HB_SFNET_URL%
+"%_HB_DIR_TOOL%pscp.exe -i" "%HB_SFNET_FRS_PRIVATE_KEY%" "%HB_RT%harbour-nightly-win.7z"             %HB_SFNET_USER%%_HB_SFNET_URL%
 
 :_EXIT
 
-%_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-log.txt        %HB_SFNET_USER%%_HB_SFNET_URL%
-%_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-mingw-log.txt  %HB_SFNET_USER%%_HB_SFNET_URL%
-rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-bcc-log.txt    %HB_SFNET_USER%%_HB_SFNET_URL%
-rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-watcom-log.txt %HB_SFNET_USER%%_HB_SFNET_URL%
+"%_HB_DIR_TOOL%pscp.exe" -i "%HB_SFNET_FRS_PRIVATE_KEY%" "%HB_RT%harbour-nightly-win-log.txt"        %HB_SFNET_USER%%_HB_SFNET_URL%
+"%_HB_DIR_TOOL%pscp.exe" -i "%HB_SFNET_FRS_PRIVATE_KEY%" "%HB_RT%harbour-nightly-win-mingw-log.txt"  %HB_SFNET_USER%%_HB_SFNET_URL%
+rem "%_HB_DIR_TOOL%pscp.exe" -i "%HB_SFNET_FRS_PRIVATE_KEY%" "%HB_RT%harbour-nightly-win-bcc-log.txt"    %HB_SFNET_USER%%_HB_SFNET_URL%
+rem "%_HB_DIR_TOOL%pscp.exe" -i "%HB_SFNET_FRS_PRIVATE_KEY%" "%HB_RT%harbour-nightly-win-watcom-log.txt" %HB_SFNET_USER%%_HB_SFNET_URL%
 
 echo ! Finished.
 
diff --git a/package/winuni/mpkg_win_uni.bat b/package/winuni/mpkg_win_uni.bat
index a6b6c1c58c..08d29da184 100644
--- a/package/winuni/mpkg_win_uni.bat
+++ b/package/winuni/mpkg_win_uni.bat
@@ -24,42 +24,42 @@ set HB_ABSROOT=%HB_RT%%HB_DR%
 
 rem ; Assemble unified package from per-target builds
 
-if exist %HB_ABSROOT% rd /q /s %HB_ABSROOT%
+if exist "%HB_ABSROOT%" rd /q /s "%HB_ABSROOT%"
 
-xcopy /y       %~dp0RELNOTES.txt                                                          %HB_ABSROOT%
-xcopy /y /s    %~dp0..\..\extras\*.*                                                      %HB_ABSROOT%extras\
-xcopy /y /s    %~dp0..\..\tests\*.*                                                       %HB_ABSROOT%tests\
-xcopy /y       %~dp0HARBOUR_README_ADDONS.txt                                             %HB_ABSROOT%addons\
-xcopy /y       %~dp0HARBOUR_README_DJGPP.txt                                              %HB_ABSROOT%comp\djgpp\
-xcopy /y       %~dp0HARBOUR_README_MINGW.txt                                              %HB_ABSROOT%comp\mingw\
-xcopy /y       %~dp0HARBOUR_README_MINGW64.txt                                            %HB_ABSROOT%comp\mingw64\
-xcopy /y       %~dp0HARBOUR_README_MINGWARM.txt                                           %HB_ABSROOT%comp\mingwarm\
-xcopy /y       %~dp0HARBOUR_README_POCC.txt                                               %HB_ABSROOT%comp\pocc\
-xcopy /y       %~dp0HARBOUR_README_WATCOM.txt                                             %HB_ABSROOT%comp\watcom\
+xcopy /y       "%~dp0RELNOTES.txt"                                                          "%HB_ABSROOT%"
+xcopy /y /s    "%~dp0..\..\extras\*.*"                                                      "%HB_ABSROOT%extras\"
+xcopy /y /s    "%~dp0..\..\tests\*.*"                                                       "%HB_ABSROOT%tests\"
+xcopy /y       "%~dp0HARBOUR_README_ADDONS.txt"                                             "%HB_ABSROOT%addons\"
+xcopy /y       "%~dp0HARBOUR_README_DJGPP.txt"                                              "%HB_ABSROOT%comp\djgpp\"
+xcopy /y       "%~dp0HARBOUR_README_MINGW.txt"                                              "%HB_ABSROOT%comp\mingw\"
+xcopy /y       "%~dp0HARBOUR_README_MINGW64.txt"                                            "%HB_ABSROOT%comp\mingw64\"
+xcopy /y       "%~dp0HARBOUR_README_MINGWARM.txt"                                           "%HB_ABSROOT%comp\mingwarm\"
+xcopy /y       "%~dp0HARBOUR_README_POCC.txt"                                               "%HB_ABSROOT%comp\pocc\"
+xcopy /y       "%~dp0HARBOUR_README_WATCOM.txt"                                             "%HB_ABSROOT%comp\watcom\"
 
-xcopy /y /s    %~dp0..\..\pkg\win\mingw\harbour-%HB_VF%-win-mingw                         %HB_ABSROOT%
+xcopy /y /s    "%~dp0..\..\pkg\win\mingw\harbour-%HB_VF%-win-mingw"                         "%HB_ABSROOT%"
 
-xcopy /y /s    %~dp0..\..\pkg\linux\watcom\harbour-%HB_VF%-linux-watcom\lib               %HB_ABSROOT%lib\linux\watcom\
-xcopy /y /s    %~dp0..\..\pkg\dos\watcom\hb%HB_VL%wa\lib                                  %HB_ABSROOT%lib\
-xcopy /y /s    %~dp0..\..\pkg\os2\watcom\harbour-%HB_VF%-os2-watcom\lib                   %HB_ABSROOT%lib\
-xcopy /y /s    %~dp0..\..\pkg\wce\mingwarm\harbour-%HB_VF%-wce-mingwarm\lib               %HB_ABSROOT%lib\
-xcopy /y /s    %~dp0..\..\pkg\win\bcc\harbour-%HB_VF%-win-bcc\lib                         %HB_ABSROOT%lib\
-xcopy /y /s    %~dp0..\..\pkg\win\bcc64\harbour-%HB_VF%-win-bcc64\lib                     %HB_ABSROOT%lib\
-xcopy /y /s    %~dp0..\..\pkg\win\mingw\harbour-%HB_VF%-win-mingw\lib                     %HB_ABSROOT%lib\
-xcopy /y /s    %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\lib                 %HB_ABSROOT%lib\
-xcopy /y /s    %~dp0..\..\pkg\win\msvc\harbour-%HB_VF%-win-msvc\lib                       %HB_ABSROOT%lib\
-xcopy /y /s    %~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\lib                   %HB_ABSROOT%lib\
-xcopy /y /s    %~dp0..\..\pkg\win\watcom\harbour-%HB_VF%-win-watcom\lib                   %HB_ABSROOT%lib\
+xcopy /y /s    "%~dp0..\..\pkg\linux\watcom\harbour-%HB_VF%-linux-watcom\lib"               "%HB_ABSROOT%lib\linux\watcom\"
+xcopy /y /s    "%~dp0..\..\pkg\dos\watcom\hb%HB_VL%wa\lib"                                  "%HB_ABSROOT%lib\"
+xcopy /y /s    "%~dp0..\..\pkg\os2\watcom\harbour-%HB_VF%-os2-watcom\lib"                   "%HB_ABSROOT%lib\"
+xcopy /y /s    "%~dp0..\..\pkg\wce\mingwarm\harbour-%HB_VF%-wce-mingwarm\lib"               "%HB_ABSROOT%lib\"
+xcopy /y /s    "%~dp0..\..\pkg\win\bcc\harbour-%HB_VF%-win-bcc\lib"                         "%HB_ABSROOT%lib\"
+xcopy /y /s    "%~dp0..\..\pkg\win\bcc64\harbour-%HB_VF%-win-bcc64\lib"                     "%HB_ABSROOT%lib\"
+xcopy /y /s    "%~dp0..\..\pkg\win\mingw\harbour-%HB_VF%-win-mingw\lib"                     "%HB_ABSROOT%lib\"
+xcopy /y /s    "%~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\lib"                 "%HB_ABSROOT%lib\"
+xcopy /y /s    "%~dp0..\..\pkg\win\msvc\harbour-%HB_VF%-win-msvc\lib"                       "%HB_ABSROOT%lib\"
+xcopy /y /s    "%~dp0..\..\pkg\win\msvc64\harbour-%HB_VF%-win-msvc64\lib"                   "%HB_ABSROOT%lib\"
+xcopy /y /s    "%~dp0..\..\pkg\win\watcom\harbour-%HB_VF%-win-watcom\lib"                   "%HB_ABSROOT%lib\"
 
-xcopy /y       %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\*.dll           %HB_ABSROOT%bin\
-xcopy /y       %~dp0..\..\pkg\wce\mingwarm\harbour-%HB_VF%-wce-mingwarm\bin\*.dll         %HB_ABSROOT%bin\
+xcopy /y       "%~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\*.dll"           "%HB_ABSROOT%bin\"
+xcopy /y       "%~dp0..\..\pkg\wce\mingwarm\harbour-%HB_VF%-wce-mingwarm\bin\*.dll"         "%HB_ABSROOT%bin\"
 
 rem ; Create special implibs for Borland (requires BCC in PATH)
 rem   NOTE: Using intermediate .def files, because direct .dll to .lib conversion
 rem         is buggy in BCC55 and BCC58 (no other versions tested), leaving off
 rem         leading underscore from certain ("random") symbols, resulting in
 rem         unresolved externals, when trying to use it. [vszakats]
-for %%a in ( %HB_ABSROOT%bin\*-%HB_VS%.dll ) do (
+for %%a in ( "%HB_ABSROOT%bin\*-%HB_VS%.dll" ) do (
    "%HB_DIR_BCC_IMPLIB%impdef.exe" -a "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.defraw" "%%a"
    echo s/LIBRARY     %%~na.DLL/LIBRARY     "%%~na.dll"/Ig> _hbtemp.sed
    sed -f _hbtemp.sed < "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.defraw" > "%HB_ABSROOT%lib\win\bcc\%%~na-bcc.def"
@@ -69,32 +69,32 @@ for %%a in ( %HB_ABSROOT%bin\*-%HB_VS%.dll ) do (
 )
 del _hbtemp.sed
 
- copy /y       %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbmk2.exe       %HB_ABSROOT%bin\hbmk2-x64.exe
- copy /y       %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbnetio.exe     %HB_ABSROOT%bin\hbnetio-x64.exe
- copy /y       %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbrun.exe       %HB_ABSROOT%bin\hbrun-x64.exe
- copy /y       %~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbtest.exe      %HB_ABSROOT%bin\hbtest-x64.exe
+ copy /y       "%~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbmk2.exe"     "%HB_ABSROOT%bin\hbmk2-x64.exe"
+ copy /y       "%~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbnetio.exe"   "%HB_ABSROOT%bin\hbnetio-x64.exe"
+ copy /y       "%~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbrun.exe"     "%HB_ABSROOT%bin\hbrun-x64.exe"
+ copy /y       "%~dp0..\..\pkg\win\mingw64\harbour-%HB_VF%-win-mingw64\bin\hbtest.exe"    "%HB_ABSROOT%bin\hbtest-x64.exe"
 
-xcopy /y       "%HB_DIR_UPX%upx.exe"                                                      %HB_ABSROOT%bin\
- copy /y       "%HB_DIR_UPX%LICENSE"                                                      %HB_ABSROOT%bin\upx_LICENSE.txt
+xcopy /y       "%HB_DIR_UPX%upx.exe"                                                      "%HB_ABSROOT%bin\"
+ copy /y       "%HB_DIR_UPX%LICENSE"                                                      "%HB_ABSROOT%bin\upx_LICENSE.txt"
 
-xcopy /y /s /e "%HB_DIR_MINGW%"                                                           %HB_ABSROOT%comp\mingw\
-rem del %HB_ABSROOT%comp\mingw\tdm-mingw-1.908.0-4.4.1-2.exe
+xcopy /y /s /e "%HB_DIR_MINGW%"                                                           "%HB_ABSROOT%comp\mingw\"
+rem del "%HB_ABSROOT%comp\mingw\tdm-mingw-1.908.0-4.4.1-2.exe"
 
-xcopy /y       "%HB_DIR_MINGW%\bin\libgcc_s_seh-1.dll"                                    %HB_ABSROOT%bin\
-xcopy /y       "%HB_DIR_MINGW%\bin\libgcc_s_sjlj-1.dll"                                   %HB_ABSROOT%bin\
-xcopy /y       "%HB_DIR_MINGW%\bin\libgcc_s_dw2-1.dll"                                    %HB_ABSROOT%bin\
-xcopy /y       "%HB_DIR_MINGW%\bin\mingwm10.dll"                                          %HB_ABSROOT%bin\
+xcopy /y       "%HB_DIR_MINGW%\bin\libgcc_s_seh-1.dll"                                    "%HB_ABSROOT%bin\"
+xcopy /y       "%HB_DIR_MINGW%\bin\libgcc_s_sjlj-1.dll"                                   "%HB_ABSROOT%bin\"
+xcopy /y       "%HB_DIR_MINGW%\bin\libgcc_s_dw2-1.dll"                                    "%HB_ABSROOT%bin\"
+xcopy /y       "%HB_DIR_MINGW%\bin\mingwm10.dll"                                          "%HB_ABSROOT%bin\"
 
 rem ; Create unified installer
 
 pushd
 
-cd %HB_RT%
+cd "%HB_RT%"
 
-if exist %HB_RT%harbour-%HB_VF%-win-log.txt del %HB_RT%harbour-%HB_VF%-win-log.txt
-if exist %HB_RT%harbour-%HB_VF%-win.exe del %HB_RT%harbour-%HB_VF%-win.exe
+if exist "%HB_RT%harbour-%HB_VF%-win-log.txt" del "%HB_RT%harbour-%HB_VF%-win-log.txt"
+if exist "%HB_RT%harbour-%HB_VF%-win.exe" del "%HB_RT%harbour-%HB_VF%-win.exe"
 
-"%HB_DIR_NSIS%makensis.exe" %HB_OPT_NSIS% %~dp0mpkg_win_uni.nsi >> %HB_RT%harbour-%HB_VF%-win-log.txt 2>&1
+"%HB_DIR_NSIS%makensis.exe" %HB_OPT_NSIS% "%~dp0mpkg_win_uni.nsi" >> "%HB_RT%harbour-%HB_VF%-win-log.txt" 2>&1
 
 rem ; Create unified archive
 
@@ -155,8 +155,8 @@ echo "%HB_DR%comp\mingw\*"                          >> _hbfiles
 echo "%HB_DR%extras\*.*"                            >> _hbfiles
 echo "%HB_DR%contrib\*.*"                           >> _hbfiles
 
-if exist %HB_RT%harbour-%HB_VF%-win.7z del %HB_RT%harbour-%HB_VF%-win.7z
-"%HB_DIR_7Z%7za.exe" a -r %HB_RT%harbour-%HB_VF%-win.7z @_hbfiles >> %HB_RT%harbour-%HB_VF%-win-log.txt 2>&1
+if exist "%HB_RT%harbour-%HB_VF%-win.7z" del "%HB_RT%harbour-%HB_VF%-win.7z"
+"%HB_DIR_7Z%7za.exe" a -r "%HB_RT%harbour-%HB_VF%-win.7z" @_hbfiles >> "%HB_RT%harbour-%HB_VF%-win-log.txt" 2>&1
 
 del _hbfiles