diff --git a/ChangeLog.txt b/ChangeLog.txt
index a0626c8e64..6340496f85 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,17 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-15 11:58 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * package/harbour.rb
+  * package/mpkg_win_nightly.bat
+  * package/updt_web_nightly.sh
+    * updated for github
+    * deleted svn headers
+
+  - package/mpkg_src_nightly.sh
+  - package/mpkg_src.sh
+    - deleted svn specific scripts
+
 2013-03-15 11:34 UTC+0100 Viktor Szakats (harbour syenar.net)
   * README.txt
     * tweak to git raw links
diff --git a/package/harbour.rb b/package/harbour.rb
index 9843489195..75df48b183 100644
--- a/package/harbour.rb
+++ b/package/harbour.rb
@@ -1,15 +1,11 @@
-#
-# $Id$
-#
-
 require 'formula'
 
 class Harbour < Formula
   url 'http://downloads.sourceforge.net/project/harbour-project/source/3.0.0/harbour-3.0.0.tar.bz2'
-  homepage 'harbour-project.sourceforge.net/'
+  homepage 'harbour-project.org/'
   sha1 '66c21d666ac24c45485179eeaa9f90458b552e92'
 
-  head 'https://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour'
+  head 'https://github.com/harbour/core.git'
 
   # depends_on 'pcre' if ARGV.include? '--with-pcre'
 
diff --git a/package/mpkg_src.sh b/package/mpkg_src.sh
deleted file mode 100755
index 9997703e7d..0000000000
--- a/package/mpkg_src.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-
-# This script requires "TAR" utilities for compression.
-
-if [ "$1" = "zip" ] || [ "$1" = "ZIP" ]; then
-   hb_archbin="zip"
-   hb_ext=".zip"
-elif tar --version >/dev/null 2>&1; then
-   hb_archbin="tar"
-   hb_gnutar="yes"
-elif gtar --version >/dev/null 2>&1; then
-   hb_archbin="gtar"
-   hb_gnutar="yes"
-else
-   hb_archbin="tar"
-   hb_gnutar="no"
-   echo "Warning!!! Cannot find GNU TAR"
-fi
-
-hb_currdir=`pwd`
-
-hb_archopt="-czf"
-[ -n "${hb_ext}" ] || hb_ext=".tar.gz"
-
-if [ -f mpkg_ver.sh ]; then
-   hb_rootdir=".."
-else
-   hb_rootdir=`dirname $0`
-   hb_rootdir=`dirname ${hb_rootdir}`
-fi
-. ${hb_rootdir}/package/mpkg_ver.sh
-
-hb_ver=`get_hbver ${hb_rootdir}`
-hb_filename="${hb_currdir}/harbour-${hb_ver}.src${hb_ext}"
-rm -f $hb_filename
-
-#[ -z "$TZ" ] && export TZ=PST8PDT
-
-hb_get_entries()
-{
-   if [ "$format" = 8 ]; then
-      sed -e '/^\f/,+1 !d' -e '/[a-zA-Z0-9_]/ !d' $1/entries
-   else
-      sed -e '/^[ ]*name="..*"[\r]*$/ !d' -e 's/^[ ]*name="\(.*\)".*$/\1/g' $1/entries
-   fi
-}
-
-hb_collect_all()
-{
-   for d in `find . -name ".svn"`
-   do
-      for f in `hb_get_entries $d`
-      do
-         f="`dirname $d`/$f"
-         [ -f "$f" ] && echo "$f"
-      done
-   done
-}
-
-hb_collect_all_svn()
-{
-   for f in `svn status -v|sed -e '/^?/ d' -e 's/.* \([^ ]*\)/\1/g'`
-   do
-      [ -f "$f" ] && echo "$f"
-   done
-}
-
-hb_collect_all_tree()
-{
-   exclude="/obj/|/lib/|/bin/.*/|\.tar|\.zip|\.exe|\.log|/linux/|/win|/config/"
-   for f in `find -type f | grep -vE ${exclude}`
-   do
-      echo ${f:2}
-   done
-   for f in `find config -type f`
-   do
-      echo ${f}
-   done
-}
-
-hb_rmflst="yes"
-hb_flst="bin/hb_flst.tmp"
-#if [ -d "$hb_rootdir/.svn" ] || [ ! -r "$hb_rootdir/$hb_flst" ]; then
-if [ -d "$hb_rootdir/.svn" ] ; then
-   hb_rmflst="yes"
-   #format=`cat $hb_rootdir/.svn/format`
-   if [ "$format" = 4 ] || [ "$format" = 8 ]; then
-      (cd "$hb_rootdir";hb_collect_all) > "$hb_rootdir/$hb_flst"
-   else
-      (cd "$hb_rootdir";hb_collect_all_svn) > "$hb_rootdir/$hb_flst"
-   fi
-   echo "$hb_flst" >> "$hb_rootdir/$hb_flst"
-else
-   hb_rmflst="yes"
-   (cd "$hb_rootdir";hb_collect_all_tree) > "$hb_rootdir/$hb_flst"
-fi
-
-if [ "$hb_archbin" = "zip" ]; then
-   (cd "$hb_rootdir";$hb_archbin -r -q $hb_filename . "-i@$hb_flst")
-else
-   (cd "$hb_rootdir";$hb_archbin $hb_archopt $hb_filename --files-from "$hb_flst")
-fi
-[ "$hb_rmflst" != "yes" ] || rm -fR "$hb_rootdir/$hb_flst"
-
-cd "$hb_currdir"
diff --git a/package/mpkg_src_nightly.sh b/package/mpkg_src_nightly.sh
deleted file mode 100755
index 7abb313f5f..0000000000
--- a/package/mpkg_src_nightly.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-
-# ---------------------------------------------------------------
-# Copyright 2010 Viktor Szakats (harbour syenar.net)
-# See COPYING.txt for licensing terms.
-# ---------------------------------------------------------------
-
-#
-# HOWTO upload unattended to sourceforge.net
-# ==========================================
-#
-# 1. Generate SSH key pair:
-#
-#    $ ssh-keygen -t dsa -C "$HB_SFNET_USER,harbour-project@frs.sourceforge.net"
-#
-#    where '$HB_SFNET_USER' is your sf.net username.
-#
-#    IMPORTANT: Leave pass-phrase empty
-#
-# 2. Paste content of generated public key file (by default 'id_dsa.pub') into
-#    'Authorized keys' edit box and press 'Update' button on this page:
-#
-#    https://sourceforge.net/account/ssh
-#
-#    You have to be logged in to sf.net.
-#
-# 3. Wait up to 10 minutes for key to be activated
-#
-# 4. Now you can use your private key file (by default 'id_dsa') instead of
-#    password to upload files. To use this script as is, set 'HB_SFNET_FRS_PRIVATE_KEY'
-#    envvar to your private key file and 'HB_SFNET_USER' envvar to your
-#    sf.net username, f.e.:
-#
-#    $ export HB_SFNET_FRS_PRIVATE_KEY=~/.ssh/id_dsa
-#    $ export HB_SFNET_USER=myuser
-#    $ ./mpkg_src_nightly.sh
-#
-# Official link with more detailed procedures:
-#    http://sourceforge.net/apps/trac/sourceforge/wiki/SSH%20keys
-#
-
-echo Starting Harbour nightly source package creation...
-
-rm -f harbour-nightly-src.zip harbour-nightly.tar.bz2 harbour-nightly.tar.gz harbour-nightly.tar.xz
-
-rm -f -r _hb_mpkg_src
-mkdir _hb_mpkg_src || {
-   echo "Failed to create directory _hb_mpkg_src"
-   exit 1
-}
-cd _hb_mpkg_src
-
-echo Downloading sources with LF line ending...
-
-svn export -q --native-eol LF http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour
-
-echo Creating bz2, gz packages...
-
-tar -c harbour/* > harbour-nightly.tar
-bzip2 -c -z harbour-nightly.tar > ../harbour-nightly.tar.bz2
-gzip -c harbour-nightly.tar > ../harbour-nightly.tar.gz
-xz -c harbour-nightly.tar > ../harbour-nightly.tar.xz
-rm harbour-nightly.tar
-
-echo Downloading sources with CRLF line ending...
-
-rm -f -r harbour
-svn export -q --native-eol CRLF http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour
-
-echo Creating zip package...
-
-zip -q -X -r -o ../harbour-nightly-src.zip harbour/*
-
-cd ..
-rm -f -r _hb_mpkg_src
-
-destdir="/home/frs/project/h/ha/harbour-project/source/nightly/"
-
-if [ -d $destdir ]
-then
-   echo Copying packages to sf.net file release area...
-
-   cp harbour-nightly-src.zip $destdir
-   cp harbour-nightly.tar.bz2 $destdir
-   cp harbour-nightly.tar.gz  $destdir
-   cp harbour-nightly.tar.xz  $destdir
-else
-   if [ "$HB_SFNET_FRS_PRIVATE_KEY" -a "$HB_SFNET_USER" ]
-   then
-
-      echo Uploading packages to sf.net file release area...
-
-      desthost=",harbour-project@frs.sourceforge.net:"
-      scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly-src.zip $HB_SFNET_USER$desthost$destdir
-      scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.bz2 $HB_SFNET_USER$desthost$destdir
-      scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.gz  $HB_SFNET_USER$desthost$destdir
-      scp -i $HB_SFNET_FRS_PRIVATE_KEY harbour-nightly.tar.xz  $HB_SFNET_USER$desthost$destdir
-   fi
-fi
-
-rm -f harbour-nightly-src.zip harbour-nightly.tar.bz2 harbour-nightly.tar.gz harbour-nightly.tar.xz
-
-echo Ended Harbour nightly source package creation.
diff --git a/package/mpkg_win_nightly.bat b/package/mpkg_win_nightly.bat
index c273f820ea..d318be797a 100644
--- a/package/mpkg_win_nightly.bat
+++ b/package/mpkg_win_nightly.bat
@@ -1,132 +1,130 @@
-@rem
-@rem $Id$
-@rem
-
-@echo off
-
-rem ---------------------------------------------------------------
-rem Copyright 2010 Viktor Szakats (harbour syenar.net)
-rem See COPYING.txt for licensing terms.
-rem ---------------------------------------------------------------
-
-rem ---------------------------------------------------------------
-rem REQUIREMENTS FOR BUILD MACHINE:
-rem   - Online 24/7 (reliable)
-rem   - Windows XP or higher (server preferred)
-rem   - 8GB disk space
-rem   - downstream internet traffic 100MB per day
-rem   - upstream internet traffic 100MB per day
-rem   - 1-5hours CPU time per day
-rem   - Multicore CPU recommended
-rem   - admin rights for MSVC setup
-rem   - admin rights for Scheduled Task setup
-rem   - remote admin (via RDC or VNC protocol, RDC preferred)
-rem
-rem NOTES:
-rem   - The first run under a new (or reinstalled) user account
-rem     must be done interactively to confirm server identity
-rem     when doing SCP uploads.
-rem ---------------------------------------------------------------
-
-pushd
-
-cd %~dp0
-
-echo ! Self: %0
-
-set _HB_DIR_3RD=%~dp03rd\
-set _HB_DIR_COMP=%~dp0comp\
-set _HB_DIR_TOOL=%~dp0tool\
-
-echo ! Downloading Harbour sources...
-
-if exist harbour rd /q /s harbour
-%_HB_DIR_TOOL%svn\bin\svn export http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour
-if errorlevel 1 goto _EXIT
-cd harbour
-
-echo ! Setting up generic build parameters...
-
-set HB_VF=nightly
-set HB_VL=%HB_VF%
-set HB_RT=%~dp0
-
-set _HB_MAKE_OPTION=HB_VERSION=%HB_VF%
-set _HB_SFNET_URL=,harbour-project@frs.sourceforge.net:/home/frs/project/h/ha/harbour-project/binaries-windows/nightly/
-
-set HB_BUILD_PKG=yes
-
-set HB_DIR_NSIS=%_HB_DIR_TOOL%nsis\
-set HB_OPT_NSIS=/DPKG_NO_COMP_BCC /DPKG_NO_COMP_MSVC /DPKG_NO_COMP_MSVC64 /DPKG_NO_COMP_MINGW64 /DPKG_NO_COMP_MINGWARM /DPKG_NO_PLAT_LINUX /DPKG_NO_PLAT_OS2 /DPKG_NO_PLAT_DOS /DPKG_NO_COMP_WATCOM
-set HB_DIR_ZIP=%_HB_DIR_TOOL%
-set HB_DIR_7Z=%_HB_DIR_TOOL%
-set HB_DIR_UPX=%_HB_DIR_TOOL%upx\
-rem set HB_DIR_BCC_IMPLIB=%_HB_DIR_COMP%bcc\Bin\
-set HB_DIR_MINGW=%_HB_DIR_COMP%mingw
-
-set HB_WITH_ADS=%_HB_DIR_3RD%ads\acesdk
-set HB_WITH_ALLEGRO=%_HB_DIR_3RD%allegro\include
-set HB_WITH_BLAT=%_HB_DIR_3RD%blat\full\source
-set HB_WITH_CAIRO=%_HB_DIR_3RD%cairo\include\cairo
-set HB_WITH_CURL=%_HB_DIR_3RD%curl\include
-set HB_WITH_FIREBIRD=%_HB_DIR_3RD%firebird\include
-set HB_WITH_FREEIMAGE=%_HB_DIR_3RD%freeimage\Dist
-set HB_WITH_GD=%_HB_DIR_3RD%gd\include
-set HB_WITH_MYSQL=%_HB_DIR_3RD%mysql\include
-set HB_WITH_OCILIB=%_HB_DIR_3RD%ocilib\include
-set HB_WITH_OPENSSL=%_HB_DIR_3RD%openssl\include
-set HB_WITH_PGSQL=%_HB_DIR_3RD%pgsql\include
-
-echo ! Building Harbour...
-
-setlocal
-echo ! Setting environment for using MinGW GCC
-set PATH=%_HB_DIR_COMP%mingw\bin
-win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-mingw-log.txt" 2>&1
-if errorlevel 1 goto _EXIT
-endlocal
-
-rem setlocal
-rem echo ! Setting environment for using Borland C++
-rem set PATH=%_HB_DIR_COMP%bcc\Bin
-rem win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-bcc-log.txt" 2>&1
-rem if errorlevel 1 goto _EXIT
-rem endlocal
-
-rem setlocal
-rem echo ! Setting environment for using Open Watcom
-rem SET WATCOM=%_HB_DIR_COMP%watcom
-rem SET PATH=%WATCOM%\BINNT;%WATCOM%\BINW
-rem SET EDPATH=%WATCOM%\EDDAT
-rem SET INCLUDE=%WATCOM%\H;%WATCOM%\H\NT
-rem win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-watcom-log.txt" 2>&1
-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%
-
-echo ! Creating unified Windows package...
-
-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%
-
-:_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%
-
-echo ! Finished.
-
-popd
+@echo off
+
+rem ---------------------------------------------------------------
+rem Copyright 2010-2013 Viktor Szakats (harbour syenar.net)
+rem See COPYING.txt for licensing terms.
+rem ---------------------------------------------------------------
+
+rem ---------------------------------------------------------------
+rem REQUIREMENTS FOR BUILD MACHINE:
+rem   - Online 24/7 (reliable)
+rem   - Windows XP or higher (server preferred)
+rem   - 8GB disk space
+rem   - downstream internet traffic 100MB per day
+rem   - upstream internet traffic 100MB per day
+rem   - 1-5hours CPU time per day
+rem   - Multicore CPU recommended
+rem   - admin rights for MSVC setup
+rem   - admin rights for Scheduled Task setup
+rem   - remote admin (via RDC or VNC protocol, RDC preferred)
+rem
+rem NOTES:
+rem   - The first run under a new (or reinstalled) user account
+rem     must be done interactively to confirm server identity
+rem     when doing SCP uploads.
+rem ---------------------------------------------------------------
+
+pushd
+
+cd %~dp0
+
+echo ! Self: %0
+
+set _HB_DIR_3RD=%~dp03rd\
+set _HB_DIR_COMP=%~dp0comp\
+set _HB_DIR_TOOL=%~dp0tool\
+
+echo ! Downloading Harbour sources...
+
+if exist core-master rd /q /s core-master
+%_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.
+cd core-master
+
+echo ! Setting up generic build parameters...
+
+set HB_VF=nightly
+set HB_VL=%HB_VF%
+set HB_RT=%~dp0
+
+set _HB_MAKE_OPTION=HB_VERSION=%HB_VF%
+set _HB_SFNET_URL=,harbour-project@frs.sourceforge.net:/home/frs/project/h/ha/harbour-project/binaries-windows/nightly/
+
+set HB_BUILD_PKG=yes
+
+set HB_DIR_NSIS=%_HB_DIR_TOOL%nsis\
+set HB_OPT_NSIS=/DPKG_NO_COMP_BCC /DPKG_NO_COMP_MSVC /DPKG_NO_COMP_MSVC64 /DPKG_NO_COMP_MINGW64 /DPKG_NO_COMP_MINGWARM /DPKG_NO_PLAT_LINUX /DPKG_NO_PLAT_OS2 /DPKG_NO_PLAT_DOS /DPKG_NO_COMP_WATCOM
+set HB_DIR_ZIP=%_HB_DIR_TOOL%
+set HB_DIR_7Z=%_HB_DIR_TOOL%
+set HB_DIR_UPX=%_HB_DIR_TOOL%upx\
+rem set HB_DIR_BCC_IMPLIB=%_HB_DIR_COMP%bcc\Bin\
+set HB_DIR_MINGW=%_HB_DIR_COMP%mingw
+
+set HB_WITH_ADS=%_HB_DIR_3RD%ads\acesdk
+set HB_WITH_ALLEGRO=%_HB_DIR_3RD%allegro\include
+set HB_WITH_BLAT=%_HB_DIR_3RD%blat\full\source
+set HB_WITH_CAIRO=%_HB_DIR_3RD%cairo\include\cairo
+set HB_WITH_CURL=%_HB_DIR_3RD%curl\include
+set HB_WITH_FIREBIRD=%_HB_DIR_3RD%firebird\include
+set HB_WITH_FREEIMAGE=%_HB_DIR_3RD%freeimage\Dist
+set HB_WITH_GD=%_HB_DIR_3RD%gd\include
+set HB_WITH_MYSQL=%_HB_DIR_3RD%mysql\include
+set HB_WITH_OCILIB=%_HB_DIR_3RD%ocilib\include
+set HB_WITH_OPENSSL=%_HB_DIR_3RD%openssl\include
+set HB_WITH_PGSQL=%_HB_DIR_3RD%pgsql\include
+
+echo ! Building Harbour...
+
+setlocal
+echo ! Setting environment for using MinGW GCC
+set PATH=%_HB_DIR_COMP%mingw\bin
+win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-mingw-log.txt" 2>&1
+if errorlevel 1 goto _EXIT
+endlocal
+
+rem setlocal
+rem echo ! Setting environment for using Borland C++
+rem set PATH=%_HB_DIR_COMP%bcc\Bin
+rem win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-bcc-log.txt" 2>&1
+rem if errorlevel 1 goto _EXIT
+rem endlocal
+
+rem setlocal
+rem echo ! Setting environment for using Open Watcom
+rem SET WATCOM=%_HB_DIR_COMP%watcom
+rem SET PATH=%WATCOM%\BINNT;%WATCOM%\BINW
+rem SET EDPATH=%WATCOM%\EDDAT
+rem SET INCLUDE=%WATCOM%\H;%WATCOM%\H\NT
+rem win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-watcom-log.txt" 2>&1
+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%
+
+echo ! Creating unified Windows package...
+
+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%
+
+:_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%
+
+echo ! Finished.
+
+popd
diff --git a/package/updt_web_nightly.sh b/package/updt_web_nightly.sh
index 6b32bcd962..4f90399d1e 100755
--- a/package/updt_web_nightly.sh
+++ b/package/updt_web_nightly.sh
@@ -1,10 +1,7 @@
 #!/bin/sh
-#
-# $Id$
-#
 
 # ---------------------------------------------------------------
-# Copyright 2012 Viktor Szakats (harbour syenar.net)
+# Copyright 2012-2013 Viktor Szakats (harbour syenar.net)
 # See COPYING.txt for licensing terms.
 # ---------------------------------------------------------------
 
@@ -53,7 +50,8 @@ cd _hb_web_src
 
 echo Downloading sources...
 
-svn export -q --native-eol LF http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/website
+wget https://github.com/harbour/website/archive/master.tar.gz
+tar -zxvf master.tar.gz
 
 echo Updating website...
 
@@ -63,7 +61,7 @@ if [ -d $destdir ]
 then
    echo Copying site to sf.net web area...
 
-   rsync -r website/* $destdir
+   rsync -r website-master/* $destdir
 else
    if [ "$HB_SFNET_WEB_PRIVATE_KEY" -a "$HB_SFNET_USER" ]
    then