diff --git a/mingw-w64-nsis-svn/001-fhs-directory-structure.patch b/mingw-w64-nsis-svn/001-fhs-directory-structure.patch
index 39c031a678..0a0514de17 100644
--- a/mingw-w64-nsis-svn/001-fhs-directory-structure.patch
+++ b/mingw-w64-nsis-svn/001-fhs-directory-structure.patch
@@ -1,6 +1,6 @@
 diff -aurN 000/SConstruct 001/SConstruct
---- 000/SConstruct	2016-01-05 22:43:57.720268200 -0200
-+++ 001/SConstruct	2016-01-05 22:43:57.751520300 -0200
+--- 000/SConstruct
++++ 001/SConstruct
 @@ -123,10 +123,10 @@
  	'relocatable': {
  		'dest': '',
@@ -35,8 +35,8 @@ diff -aurN 000/SConstruct 001/SConstruct
  def DistributeStubs(files, names=[], path='', alias=None):
  	return defenv.Distribute(files, names, 'data', 'Stubs', path, alias, 'stubs')
 diff -aurN 000/Source/build.cpp 001/Source/build.cpp
---- 000/Source/build.cpp	2016-01-05 20:25:09.797546300 -0200
-+++ 001/Source/build.cpp	2016-01-05 20:27:03.794162700 -0200
+--- 000/Source/build.cpp
++++ 001/Source/build.cpp
 @@ -394,7 +394,9 @@
    if (dir) nsis_dir = dir;
    else {
@@ -46,11 +46,11 @@ diff -aurN 000/Source/build.cpp 001/Source/build.cpp
 +      + PLATFORM_PATH_SEPARATOR_STR + _TEXT("share")
 +      + PLATFORM_PATH_SEPARATOR_STR + _TEXT("nsis");
  #else
-     nsis_dir = PosixBug_CtoTString(PREFIX_DATA);
+     nsis_dir = _T(PREFIX_DATA);
  #endif
 diff -aurN 000/Source/makenssi.cpp 001/Source/makenssi.cpp
---- 000/Source/makenssi.cpp	2016-01-05 20:25:09.938172300 -0200
-+++ 001/Source/makenssi.cpp	2016-01-05 20:27:03.803162300 -0200
+--- 000/Source/makenssi.cpp
++++ 001/Source/makenssi.cpp
 @@ -559,7 +559,8 @@
          TCHAR* env_var = _tgetenv(_T("NSISCONFDIR"));
          if(env_var == NULL)
@@ -59,5 +59,5 @@ diff -aurN 000/Source/makenssi.cpp 001/Source/makenssi.cpp
 +          main_conf = get_dir_name(get_executable_dir(argv[0]))
 +            + PLATFORM_PATH_SEPARATOR_STR + _TEXT("etc");
  #else
-           main_conf = PosixBug_CtoTString(PREFIX_CONF);
+           main_conf = _T(PREFIX_CONF);
  #endif
diff --git a/mingw-w64-nsis-svn/002-compile-fixes.patch b/mingw-w64-nsis-svn/002-compile-fixes.patch
index 73d77fdfe4..a66828eabb 100644
--- a/mingw-w64-nsis-svn/002-compile-fixes.patch
+++ b/mingw-w64-nsis-svn/002-compile-fixes.patch
@@ -1,6 +1,6 @@
 diff -aurN 001/SCons/Config/gnu 002/SCons/Config/gnu
---- 001/SCons/Config/gnu	2016-01-05 22:44:50.845375300 -0200
-+++ 002/SCons/Config/gnu	2016-01-05 22:44:50.861001300 -0200
+--- 001/SCons/Config/gnu
++++ 002/SCons/Config/gnu
 @@ -21,6 +21,8 @@
  def cross_env(env):
  	if env['PLATFORM'] != 'win32':
@@ -20,8 +20,8 @@ diff -aurN 001/SCons/Config/gnu 002/SCons/Config/gnu
  # Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL 
  if defenv['PLATFORM'] == 'win32':
 diff -aurN 001/SCons/utils.py 002/SCons/utils.py
---- 001/SCons/utils.py	2016-01-05 22:44:12.595300800 -0200
-+++ 002/SCons/utils.py	2016-01-05 22:44:12.673423300 -0200
+--- 001/SCons/utils.py
++++ 002/SCons/utils.py
 @@ -16,19 +16,6 @@
  	appropriate compiler and linker options to the environment
  	"""
@@ -43,8 +43,8 @@ diff -aurN 001/SCons/utils.py 002/SCons/utils.py
  	# Avoid unnecessary configuring when cleaning targets 
  	# and a clash when scons is run in parallel operation.
 diff -aurN 001/SConstruct 002/SConstruct
---- 001/SConstruct	2016-01-05 22:43:57.751520300 -0200
-+++ 002/SConstruct	2016-01-05 22:43:57.782770900 -0200
+--- 001/SConstruct
++++ 002/SConstruct
 @@ -252,7 +252,7 @@
  # write version into version.h
  f = open(defenv.File('#$BUILD_CONFIG/nsis-version.h').abspath, 'w')
@@ -55,9 +55,9 @@ diff -aurN 001/SConstruct 002/SConstruct
  if (not defenv.has_key('VER_PACKED')) and defenv.has_key('VER_MAJOR') and defenv.has_key('VER_MINOR'):
  	packed_r = packed_b = 0
 diff -aurN 001/Source/script.cpp 002/Source/script.cpp
---- 001/Source/script.cpp	2016-01-05 20:25:50.828879800 -0200
-+++ 002/Source/script.cpp	2016-01-05 20:52:42.575814900 -0200
-@@ -3182,7 +3182,8 @@
+--- 001/Source/script.cpp
++++ 002/Source/script.cpp
+@@ -3180,7 +3180,8 @@
        {
          TCHAR* cmdstr=line.gettoken_str(1);
          struct postbuild_cmd *newcmd, *prevcmd;
@@ -68,9 +68,9 @@ diff -aurN 001/Source/script.cpp 002/Source/script.cpp
          _tcscpy(newcmd->cmd,cmdstr);
          for (prevcmd=postbuild_cmds; prevcmd && prevcmd->next;) prevcmd = prevcmd->next;
 diff -aurN 001/Source/util.cpp 002/Source/util.cpp
---- 001/Source/util.cpp	2016-01-05 20:25:50.469504200 -0200
-+++ 002/Source/util.cpp	2016-01-05 20:52:42.575814900 -0200
-@@ -967,7 +967,10 @@
+--- 001/Source/util.cpp
++++ 002/Source/util.cpp
+@@ -965,7 +965,10 @@
  {
    STARTUPINFO si = { sizeof(STARTUPINFO), };
    PROCESS_INFORMATION pi;
diff --git a/mingw-w64-nsis-svn/003-remove-redundant-architecture-suffix.patch b/mingw-w64-nsis-svn/003-remove-redundant-architecture-suffix.patch
index d372cf6b8f..4ae5331965 100644
--- a/mingw-w64-nsis-svn/003-remove-redundant-architecture-suffix.patch
+++ b/mingw-w64-nsis-svn/003-remove-redundant-architecture-suffix.patch
@@ -1,6 +1,6 @@
-diff -aurN 002/SConstruct 004/SConstruct
---- 002/SConstruct	2016-01-05 22:43:57.782770900 -0200
-+++ 004/SConstruct	2016-01-05 22:43:57.798392900 -0200
+diff -aurN 002/SConstruct 003/SConstruct
+--- 002/SConstruct
++++ 003/SConstruct
 @@ -518,10 +518,8 @@
  def GetArcSuffix(env, unicode = None):
  	if unicode is None:
@@ -14,10 +14,10 @@ diff -aurN 002/SConstruct 004/SConstruct
  
  ######################################################################
  #######  Distribution                                              ###
-diff -aurN 002/Source/build.cpp 004/Source/build.cpp
---- 002/Source/build.cpp	2016-01-05 20:30:55.101586600 -0200
-+++ 004/Source/build.cpp	2016-01-05 22:33:38.994344500 -0200
-@@ -3541,7 +3541,7 @@
+diff -aurN 002/Source/build.cpp 003/Source/build.cpp
+--- 002/Source/build.cpp
++++ 003/Source/build.cpp
+@@ -3552,7 +3552,7 @@
  
    tstring searchPath = definedlist.find(_T("NSISDIR"));
    searchPath += PLATFORM_PATH_SEPARATOR_STR _T("Plugins") PLATFORM_PATH_SEPARATOR_STR;
@@ -26,7 +26,7 @@ diff -aurN 002/Source/build.cpp 004/Source/build.cpp
  
    SCRIPT_MSG(_T("Processing default plugins: \"%") NPRIs PLATFORM_PATH_SEPARATOR_STR _T("*.dll\"\n"), searchPath.c_str());
    if (!m_pPlugins->Initialize(searchPath.c_str(), is_target_64bit(), !!display_script))
-@@ -3820,21 +3820,32 @@
+@@ -3831,21 +3831,32 @@
  
  CEXEBuild::TARGETTYPE CEXEBuild::get_target_type(const TCHAR*s) const
  {
@@ -64,7 +64,7 @@ diff -aurN 002/Source/build.cpp 004/Source/build.cpp
    default: return defval;
    }
  }
-@@ -3845,17 +3856,22 @@
+@@ -3856,17 +3867,22 @@
    errstr += _T(": Target parameter must be one of: "), errstr += prefix;
    for(int comma = 0, i = CEXEBuild::TARGETFIRST; i < CEXEBuild::TARGETCOUNT; ++i)
    {
@@ -89,9 +89,9 @@ diff -aurN 002/Source/build.cpp 004/Source/build.cpp
  }
  
  int CEXEBuild::update_exehead(const tstring& file, size_t *size/*=NULL*/) {
-diff -aurN 002/Source/build.h 004/Source/build.h
---- 002/Source/build.h	2016-01-05 22:43:39.563983700 -0200
-+++ 004/Source/build.h	2016-01-05 22:43:40.860865100 -0200
+diff -aurN 002/Source/build.h 003/Source/build.h
+--- 002/Source/build.h
++++ 003/Source/build.h
 @@ -128,8 +128,8 @@
      TARGETTYPE m_target_type;
      TARGETTYPE get_target_type(const TCHAR*s) const;
@@ -103,9 +103,9 @@ diff -aurN 002/Source/build.h 004/Source/build.h
      static bool is_targettype_64bit(TARGETTYPE tt) { return TARGET_AMD64 == tt; }
      bool is_target_64bit() const { return is_targettype_64bit(m_target_type); }
      void print_bad_targettype_parameter(const TCHAR*cmdname, const TCHAR*prefix = _T("")) const;
-diff -aurN 002/Source/makenssi.cpp 004/Source/makenssi.cpp
---- 002/Source/makenssi.cpp	2016-01-05 20:30:55.101586600 -0200
-+++ 004/Source/makenssi.cpp	2016-01-05 22:31:11.613989400 -0200
+diff -aurN 002/Source/makenssi.cpp 003/Source/makenssi.cpp
+--- 002/Source/makenssi.cpp
++++ 003/Source/makenssi.cpp
 @@ -646,7 +646,7 @@
      _ftprintf(g_output,_T("\nProcessed "));
      if (files_processed) _ftprintf(g_output,_T("%d file%") NPRIs _T(", "),files_processed,files_processed==1?_T(""):_T("s"));
@@ -115,10 +115,10 @@ diff -aurN 002/Source/makenssi.cpp 004/Source/makenssi.cpp
      fflush(g_output);
    }
    
-diff -aurN 002/Source/script.cpp 004/Source/script.cpp
---- 002/Source/script.cpp	2016-01-05 20:52:42.575814900 -0200
-+++ 004/Source/script.cpp	2016-01-05 22:37:17.250715600 -0200
-@@ -4812,7 +4812,7 @@
+diff -aurN 002/Source/script.cpp 003/Source/script.cpp
+--- 002/Source/script.cpp
++++ 003/Source/script.cpp
+@@ -4810,7 +4810,7 @@
              {
                pluginfullpath = definedlist.find(_T("NSISDIR"));
                pluginfullpath += tstring(PLATFORM_PATH_SEPARATOR_STR) + _T("Plugins");
diff --git a/mingw-w64-nsis-svn/PKGBUILD b/mingw-w64-nsis-svn/PKGBUILD
index c42aa13950..d523a0dbcd 100644
--- a/mingw-w64-nsis-svn/PKGBUILD
+++ b/mingw-w64-nsis-svn/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}-svn"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-svn"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=r6699
+pkgver=r6749
 pkgrel=1
 url='http://nsis.sourceforge.net'
 pkgdesc='Windows installer development tool (mingw-w64)'
@@ -16,15 +16,16 @@ depends=(${MINGW_PACKAGE_PREFIX}-zlib
          ${MINGW_PACKAGE_PREFIX}-libwinpthread)
 makedepends=(${MINGW_PACKAGE_PREFIX}-gcc
              'scons>=2.3.4-3'
+             rsync
              svn)
 source=(${_realname}.svn::svn+'http://svn.code.sf.net/p/nsis/code/NSIS/trunk'
         001-fhs-directory-structure.patch
         002-compile-fixes.patch
         003-remove-redundant-architecture-suffix.patch)
 sha256sums=('SKIP'
-            'ff4d41f30ee48072e18b0f8e349c33286290574bf8779ef21c15cc1754f70949'
-            '4bbdee2e7451fce218b68e127da9d34d911dd71a405850b021bf59eff41b2a91'
-            'bad0696d1aaa7bcf927f06fd476d3c3404ebf12b63981e345f075e5f157131ef')
+            '70e21760b037b03c6b73b3babb418c386ee2e2c18f4c99a5c3b9040c1a18b20f'
+            '92dd16e882aa6270b2d6a75392ebff4514332af7abd5e02da3c7874fb5953aa3'
+            '0a7a2f7c671d7776def53e2e0974b803096409fc886e78393761092556084d9e')
 
 # Circumvent problem where makepkg will add the exe extension to some files
 # when compressing the 64-bit package
@@ -35,12 +36,22 @@ pkgver() {
     printf "r%s" "$(svnversion | tr -d 'A-z')"
 }
 
+consolidate() {
+    msg2 'Converting to unix line breaks'
+    find -name 'SConstruct' | xargs dos2unix --quiet
+    find -name 'SConscript' | xargs dos2unix --quiet
+    find -name '*.[ch]'     | xargs dos2unix --quiet
+    find -name '*.cpp'      | xargs dos2unix --quiet
+    find -name '*.py'       | xargs dos2unix --quiet
+}
+
 prepare() {
     cd "${srcdir}/${_realname}.svn"
     if [[ -n $(svn diff SConstruct) ]]; then
         msg2 'Skipping already applied patches'
         return 0
     fi
+    consolidate
     patch -p1 < "${startdir}"/001-fhs-directory-structure.patch
     patch -p1 < "${startdir}"/002-compile-fixes.patch
     patch -p1 < "${startdir}"/003-remove-redundant-architecture-suffix.patch
@@ -49,11 +60,16 @@ prepare() {
 _build() {
     local target_arch="${CARCH/i686/x86}"
     target_arch="${target_arch/x86_64/amd64}"
+
+    local revision="${pkgver#r}"
+    msg2 "Revision defined as ${revision}"
+
     cd "${srcdir}/${_realname}.build.${CARCH}"
     scons \
         TARGET_ARCH="${target_arch}" \
         PREFIX="${MINGW_PREFIX}" \
         VERSION="${pkgver}" \
+        VER_REVISION="${revision}" \
         UNICODE='yes' \
         NSIS_MAX_STRLEN='8192' \
         NSIS_CONFIG_CONST_DATA_PATH='no' \
diff --git a/mingw-w64-nsis/001-fhs-directory-structure.patch b/mingw-w64-nsis/001-fhs-directory-structure.patch
index 39c031a678..0a0514de17 100644
--- a/mingw-w64-nsis/001-fhs-directory-structure.patch
+++ b/mingw-w64-nsis/001-fhs-directory-structure.patch
@@ -1,6 +1,6 @@
 diff -aurN 000/SConstruct 001/SConstruct
---- 000/SConstruct	2016-01-05 22:43:57.720268200 -0200
-+++ 001/SConstruct	2016-01-05 22:43:57.751520300 -0200
+--- 000/SConstruct
++++ 001/SConstruct
 @@ -123,10 +123,10 @@
  	'relocatable': {
  		'dest': '',
@@ -35,8 +35,8 @@ diff -aurN 000/SConstruct 001/SConstruct
  def DistributeStubs(files, names=[], path='', alias=None):
  	return defenv.Distribute(files, names, 'data', 'Stubs', path, alias, 'stubs')
 diff -aurN 000/Source/build.cpp 001/Source/build.cpp
---- 000/Source/build.cpp	2016-01-05 20:25:09.797546300 -0200
-+++ 001/Source/build.cpp	2016-01-05 20:27:03.794162700 -0200
+--- 000/Source/build.cpp
++++ 001/Source/build.cpp
 @@ -394,7 +394,9 @@
    if (dir) nsis_dir = dir;
    else {
@@ -46,11 +46,11 @@ diff -aurN 000/Source/build.cpp 001/Source/build.cpp
 +      + PLATFORM_PATH_SEPARATOR_STR + _TEXT("share")
 +      + PLATFORM_PATH_SEPARATOR_STR + _TEXT("nsis");
  #else
-     nsis_dir = PosixBug_CtoTString(PREFIX_DATA);
+     nsis_dir = _T(PREFIX_DATA);
  #endif
 diff -aurN 000/Source/makenssi.cpp 001/Source/makenssi.cpp
---- 000/Source/makenssi.cpp	2016-01-05 20:25:09.938172300 -0200
-+++ 001/Source/makenssi.cpp	2016-01-05 20:27:03.803162300 -0200
+--- 000/Source/makenssi.cpp
++++ 001/Source/makenssi.cpp
 @@ -559,7 +559,8 @@
          TCHAR* env_var = _tgetenv(_T("NSISCONFDIR"));
          if(env_var == NULL)
@@ -59,5 +59,5 @@ diff -aurN 000/Source/makenssi.cpp 001/Source/makenssi.cpp
 +          main_conf = get_dir_name(get_executable_dir(argv[0]))
 +            + PLATFORM_PATH_SEPARATOR_STR + _TEXT("etc");
  #else
-           main_conf = PosixBug_CtoTString(PREFIX_CONF);
+           main_conf = _T(PREFIX_CONF);
  #endif
diff --git a/mingw-w64-nsis/002-compile-fixes.patch b/mingw-w64-nsis/002-compile-fixes.patch
index 73d77fdfe4..a66828eabb 100644
--- a/mingw-w64-nsis/002-compile-fixes.patch
+++ b/mingw-w64-nsis/002-compile-fixes.patch
@@ -1,6 +1,6 @@
 diff -aurN 001/SCons/Config/gnu 002/SCons/Config/gnu
---- 001/SCons/Config/gnu	2016-01-05 22:44:50.845375300 -0200
-+++ 002/SCons/Config/gnu	2016-01-05 22:44:50.861001300 -0200
+--- 001/SCons/Config/gnu
++++ 002/SCons/Config/gnu
 @@ -21,6 +21,8 @@
  def cross_env(env):
  	if env['PLATFORM'] != 'win32':
@@ -20,8 +20,8 @@ diff -aurN 001/SCons/Config/gnu 002/SCons/Config/gnu
  # Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL 
  if defenv['PLATFORM'] == 'win32':
 diff -aurN 001/SCons/utils.py 002/SCons/utils.py
---- 001/SCons/utils.py	2016-01-05 22:44:12.595300800 -0200
-+++ 002/SCons/utils.py	2016-01-05 22:44:12.673423300 -0200
+--- 001/SCons/utils.py
++++ 002/SCons/utils.py
 @@ -16,19 +16,6 @@
  	appropriate compiler and linker options to the environment
  	"""
@@ -43,8 +43,8 @@ diff -aurN 001/SCons/utils.py 002/SCons/utils.py
  	# Avoid unnecessary configuring when cleaning targets 
  	# and a clash when scons is run in parallel operation.
 diff -aurN 001/SConstruct 002/SConstruct
---- 001/SConstruct	2016-01-05 22:43:57.751520300 -0200
-+++ 002/SConstruct	2016-01-05 22:43:57.782770900 -0200
+--- 001/SConstruct
++++ 002/SConstruct
 @@ -252,7 +252,7 @@
  # write version into version.h
  f = open(defenv.File('#$BUILD_CONFIG/nsis-version.h').abspath, 'w')
@@ -55,9 +55,9 @@ diff -aurN 001/SConstruct 002/SConstruct
  if (not defenv.has_key('VER_PACKED')) and defenv.has_key('VER_MAJOR') and defenv.has_key('VER_MINOR'):
  	packed_r = packed_b = 0
 diff -aurN 001/Source/script.cpp 002/Source/script.cpp
---- 001/Source/script.cpp	2016-01-05 20:25:50.828879800 -0200
-+++ 002/Source/script.cpp	2016-01-05 20:52:42.575814900 -0200
-@@ -3182,7 +3182,8 @@
+--- 001/Source/script.cpp
++++ 002/Source/script.cpp
+@@ -3180,7 +3180,8 @@
        {
          TCHAR* cmdstr=line.gettoken_str(1);
          struct postbuild_cmd *newcmd, *prevcmd;
@@ -68,9 +68,9 @@ diff -aurN 001/Source/script.cpp 002/Source/script.cpp
          _tcscpy(newcmd->cmd,cmdstr);
          for (prevcmd=postbuild_cmds; prevcmd && prevcmd->next;) prevcmd = prevcmd->next;
 diff -aurN 001/Source/util.cpp 002/Source/util.cpp
---- 001/Source/util.cpp	2016-01-05 20:25:50.469504200 -0200
-+++ 002/Source/util.cpp	2016-01-05 20:52:42.575814900 -0200
-@@ -967,7 +967,10 @@
+--- 001/Source/util.cpp
++++ 002/Source/util.cpp
+@@ -965,7 +965,10 @@
  {
    STARTUPINFO si = { sizeof(STARTUPINFO), };
    PROCESS_INFORMATION pi;
diff --git a/mingw-w64-nsis/003-remove-redundant-architecture-suffix.patch b/mingw-w64-nsis/003-remove-redundant-architecture-suffix.patch
index d372cf6b8f..4ae5331965 100644
--- a/mingw-w64-nsis/003-remove-redundant-architecture-suffix.patch
+++ b/mingw-w64-nsis/003-remove-redundant-architecture-suffix.patch
@@ -1,6 +1,6 @@
-diff -aurN 002/SConstruct 004/SConstruct
---- 002/SConstruct	2016-01-05 22:43:57.782770900 -0200
-+++ 004/SConstruct	2016-01-05 22:43:57.798392900 -0200
+diff -aurN 002/SConstruct 003/SConstruct
+--- 002/SConstruct
++++ 003/SConstruct
 @@ -518,10 +518,8 @@
  def GetArcSuffix(env, unicode = None):
  	if unicode is None:
@@ -14,10 +14,10 @@ diff -aurN 002/SConstruct 004/SConstruct
  
  ######################################################################
  #######  Distribution                                              ###
-diff -aurN 002/Source/build.cpp 004/Source/build.cpp
---- 002/Source/build.cpp	2016-01-05 20:30:55.101586600 -0200
-+++ 004/Source/build.cpp	2016-01-05 22:33:38.994344500 -0200
-@@ -3541,7 +3541,7 @@
+diff -aurN 002/Source/build.cpp 003/Source/build.cpp
+--- 002/Source/build.cpp
++++ 003/Source/build.cpp
+@@ -3552,7 +3552,7 @@
  
    tstring searchPath = definedlist.find(_T("NSISDIR"));
    searchPath += PLATFORM_PATH_SEPARATOR_STR _T("Plugins") PLATFORM_PATH_SEPARATOR_STR;
@@ -26,7 +26,7 @@ diff -aurN 002/Source/build.cpp 004/Source/build.cpp
  
    SCRIPT_MSG(_T("Processing default plugins: \"%") NPRIs PLATFORM_PATH_SEPARATOR_STR _T("*.dll\"\n"), searchPath.c_str());
    if (!m_pPlugins->Initialize(searchPath.c_str(), is_target_64bit(), !!display_script))
-@@ -3820,21 +3820,32 @@
+@@ -3831,21 +3831,32 @@
  
  CEXEBuild::TARGETTYPE CEXEBuild::get_target_type(const TCHAR*s) const
  {
@@ -64,7 +64,7 @@ diff -aurN 002/Source/build.cpp 004/Source/build.cpp
    default: return defval;
    }
  }
-@@ -3845,17 +3856,22 @@
+@@ -3856,17 +3867,22 @@
    errstr += _T(": Target parameter must be one of: "), errstr += prefix;
    for(int comma = 0, i = CEXEBuild::TARGETFIRST; i < CEXEBuild::TARGETCOUNT; ++i)
    {
@@ -89,9 +89,9 @@ diff -aurN 002/Source/build.cpp 004/Source/build.cpp
  }
  
  int CEXEBuild::update_exehead(const tstring& file, size_t *size/*=NULL*/) {
-diff -aurN 002/Source/build.h 004/Source/build.h
---- 002/Source/build.h	2016-01-05 22:43:39.563983700 -0200
-+++ 004/Source/build.h	2016-01-05 22:43:40.860865100 -0200
+diff -aurN 002/Source/build.h 003/Source/build.h
+--- 002/Source/build.h
++++ 003/Source/build.h
 @@ -128,8 +128,8 @@
      TARGETTYPE m_target_type;
      TARGETTYPE get_target_type(const TCHAR*s) const;
@@ -103,9 +103,9 @@ diff -aurN 002/Source/build.h 004/Source/build.h
      static bool is_targettype_64bit(TARGETTYPE tt) { return TARGET_AMD64 == tt; }
      bool is_target_64bit() const { return is_targettype_64bit(m_target_type); }
      void print_bad_targettype_parameter(const TCHAR*cmdname, const TCHAR*prefix = _T("")) const;
-diff -aurN 002/Source/makenssi.cpp 004/Source/makenssi.cpp
---- 002/Source/makenssi.cpp	2016-01-05 20:30:55.101586600 -0200
-+++ 004/Source/makenssi.cpp	2016-01-05 22:31:11.613989400 -0200
+diff -aurN 002/Source/makenssi.cpp 003/Source/makenssi.cpp
+--- 002/Source/makenssi.cpp
++++ 003/Source/makenssi.cpp
 @@ -646,7 +646,7 @@
      _ftprintf(g_output,_T("\nProcessed "));
      if (files_processed) _ftprintf(g_output,_T("%d file%") NPRIs _T(", "),files_processed,files_processed==1?_T(""):_T("s"));
@@ -115,10 +115,10 @@ diff -aurN 002/Source/makenssi.cpp 004/Source/makenssi.cpp
      fflush(g_output);
    }
    
-diff -aurN 002/Source/script.cpp 004/Source/script.cpp
---- 002/Source/script.cpp	2016-01-05 20:52:42.575814900 -0200
-+++ 004/Source/script.cpp	2016-01-05 22:37:17.250715600 -0200
-@@ -4812,7 +4812,7 @@
+diff -aurN 002/Source/script.cpp 003/Source/script.cpp
+--- 002/Source/script.cpp
++++ 003/Source/script.cpp
+@@ -4810,7 +4810,7 @@
              {
                pluginfullpath = definedlist.find(_T("NSISDIR"));
                pluginfullpath += tstring(PLATFORM_PATH_SEPARATOR_STR) + _T("Plugins");
diff --git a/mingw-w64-nsis/PKGBUILD b/mingw-w64-nsis/PKGBUILD
index 6ae9a39223..b74a05bd96 100644
--- a/mingw-w64-nsis/PKGBUILD
+++ b/mingw-w64-nsis/PKGBUILD
@@ -3,7 +3,7 @@
 _realname='nsis'
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.0b3
+pkgver=3.0rc1
 pkgrel=1
 url='http://nsis.sourceforge.net'
 pkgdesc='Windows installer development tool (mingw-w64)'
@@ -13,22 +13,33 @@ depends=(${MINGW_PACKAGE_PREFIX}-zlib
          ${MINGW_PACKAGE_PREFIX}-gcc-libs
          ${MINGW_PACKAGE_PREFIX}-libwinpthread)
 makedepends=(${MINGW_PACKAGE_PREFIX}-gcc
-             'scons>=2.3.4-3')
+             'scons>=2.3.4-3'
+             rsync)
 source=("https://sourceforge.net/projects/nsis/files/NSIS%203%20Pre-release/${pkgver}/nsis-${pkgver}-src.tar.bz2"
         001-fhs-directory-structure.patch
         002-compile-fixes.patch
         003-remove-redundant-architecture-suffix.patch)
-sha256sums=('faf22d6cd4bd46780afcf22524a1de39bcc38c85773719ec7a1ecf002e308d3a'
-            'ff4d41f30ee48072e18b0f8e349c33286290574bf8779ef21c15cc1754f70949'
-            '4bbdee2e7451fce218b68e127da9d34d911dd71a405850b021bf59eff41b2a91'
-            'bad0696d1aaa7bcf927f06fd476d3c3404ebf12b63981e345f075e5f157131ef')
+sha256sums=('4e2a98c96f470386f41dcc7fd3163935228f8833d6accd0884aa0f4cb960b232'
+            '70e21760b037b03c6b73b3babb418c386ee2e2c18f4c99a5c3b9040c1a18b20f'
+            '92dd16e882aa6270b2d6a75392ebff4514332af7abd5e02da3c7874fb5953aa3'
+            '0a7a2f7c671d7776def53e2e0974b803096409fc886e78393761092556084d9e')
 
 # Circumvent problem where makepkg will add the exe extension to some files
 # when compressing the 64-bit package
 options=('!strip')
 
+consolidate() {
+    msg2 'Converting to unix line breaks'
+    find -name 'SConstruct' | xargs dos2unix --quiet
+    find -name 'SConscript' | xargs dos2unix --quiet
+    find -name '*.[ch]'     | xargs dos2unix --quiet
+    find -name '*.cpp'      | xargs dos2unix --quiet
+    find -name '*.py'       | xargs dos2unix --quiet
+}
+
 prepare() {
     cd "${srcdir}/${_realname}-${pkgver}-src"
+    consolidate
     patch -p1 < "${startdir}"/001-fhs-directory-structure.patch
     patch -p1 < "${startdir}"/002-compile-fixes.patch
     patch -p1 < "${startdir}"/003-remove-redundant-architecture-suffix.patch
@@ -37,11 +48,20 @@ prepare() {
 _build() {
     local target_arch="${CARCH/i686/x86}"
     target_arch="${target_arch/x86_64/amd64}"
+
+    local major_version="${pkgver%%.*}"
+    local minor_version="${pkgver#*.}"
+    minor_version="${minor_version%%[a-z]*}"
+    msg2 "Major version defined as ${major_version}"
+    msg2 "Minor version defined as ${minor_version}"
+
     cd "${srcdir}/build-${CARCH}-${_realname}-${pkgver}"
     scons \
         TARGET_ARCH="${target_arch}" \
         PREFIX="${MINGW_PREFIX}" \
         VERSION="${pkgver}" \
+        VER_MAJOR="${major_version}" \
+        VER_MINOR="${minor_version}" \
         UNICODE='yes' \
         NSIS_MAX_STRLEN='8192' \
         NSIS_CONFIG_CONST_DATA_PATH='no' \