diff --git a/Contrib/NSIS Update/NSISUpdate.nsi b/Contrib/NSIS Update/NSISUpdate.nsi
new file mode 100644
index 00000000..66f06dc9
--- /dev/null
+++ b/Contrib/NSIS Update/NSISUpdate.nsi	
@@ -0,0 +1,328 @@
+# NSIS Update
+#####################################################################
+# Original version Copyright (C) 2002-2003 Nathan Purciful.
+# Version for NSIS distribution Copyright (C) 2003 Joost Verburg.
+#
+# This software is provided 'as-is', without any express or implied
+# warranty.  In no event will the authors be held liable for any 
+# damages arising from the use of this software.
+#
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute
+# it freely, subject to the following restrictions:
+#
+# 1. The origin of this software must not be misrepresented; you must
+#    not claim that you wrote the original software. If you use this
+#    software in a product, an acknowledgment in the product
+#    documentation would be appreciated but is not required.
+# 2. Altered source versions must be plainly marked as such, and must
+#    not be misrepresented as being the original software.
+# 3. This notice may not be removed or altered from any source
+#    distribution.
+#
+# This program uses CVSNT software, http://www.cvsnt.org/
+#
+#####################################################################
+# Defines
+
+!define MISSINGFILES $0
+!define NSISPATH $1
+
+!define TEMP1 $R0
+!define TEMP2 $R1
+!define TEMP3 $R2
+
+#####################################################################
+# Modern UI
+
+!define MUI_PRODUCT "NSIS Update"
+!define MUI_VERSION ""
+!define MUI_BRANDINGTEXT " "
+!define MUI_UI "Resources\GUI\NSISUpdate.exe"
+!define MUI_ICON "${NSISDIR}\Contrib\Icons\yi-simple2_install.ico"
+
+!define MUI_CUSTOMPAGECOMMANDS
+
+!include "MUI.nsh"
+
+!insertmacro MUI_SYSTEM
+
+!insertmacro MUI_LANGUAGE "English"
+
+Page custom UpdateMethod ": Update Method"
+!insertmacro MUI_PAGECOMMAND_INSTFILES
+
+#####################################################################
+# Configuration
+
+Caption /LANG=${LANG_ENGLISH} "${MUI_PRODUCT}"
+OutFile "..\..\Bin\NSISUpdate.exe"
+InstallButtonText "Update"
+ShowInstDetails show
+
+#####################################################################
+# Macros
+
+!macro checkFile PATH FILE
+
+  IfFileExists "${PATH}\${FILE}" +2
+    StrCpy ${MISSINGFILES} "${FILE} ${MISSINGFILES}"
+    
+!macroend
+
+!macro checkFileDownload PATH FILE
+
+  IfFileExists "${PATH}\${FILE}" "Done_${FILE}"
+    
+    IfFileExists "$PLUGINSDIR\bzip2.exe" +3"
+      File "/oname=$PLUGINSDIR\bzip2.exe" "Resources\bin\bzip2.exe"
+    
+    NSISdl::download "http://nsis.sourceforge.net/nsisupdate/${FILE}.bz2" "${PATH}\${FILE}.bz2"
+    Pop ${TEMP1}
+    
+    StrCmp ${TEMP1} "success" "Extract_${FILE}"
+      MessageBox MB_OK|MB_ICONSTOP "Download failed: ${TEMP1}."
+      Quit
+      
+    "Extract_${FILE}:"
+      nsExec::ExecToLog '"$PLUGINSDIR\bzip2.exe" -vd "${PATH}\${FILE}.bz2"'
+      
+    IfFileExists "${PATH}\${FILE}" "Done_${FILE}"
+      MessageBox MB_OK|MB_ICONSTOP "Extraction failed."
+      Quit
+    
+    "Done_${FILE}:"
+    
+!macroend
+
+#####################################################################
+# Functions
+
+Function .onInit
+
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "Resources\GUI\io.ini" "io.ini"
+  
+  # InitPluginsDir called by Modern UI InstallOptions extract macro
+
+FunctionEnd
+
+Function CheckCVSAccess
+  
+  IfFileExists "${NSISPATH}\Cvs\Root" +2
+    Return
+  
+  Push ${TEMP1}
+  Push ${TEMP2}
+    
+    FileOpen ${TEMP1} "${NSISPATH}\CVS\Root" r
+    FileRead ${TEMP1} ${TEMP2} 9
+    FileClose ${TEMP1}
+    
+    StrCmp ${TEMP2} ":pserver:" AccessOK
+      
+      MessageBox MB_OK|MB_ICONSTOP "NSIS Update only supports anonymous CVS access.$\r$\nNSIS developers should use a client with support for the :ext: access mode."
+      Quit
+    
+    AccessOK:
+      
+  Pop ${TEMP2}
+  Pop ${TEMP1}
+    
+FunctionEnd
+
+Function CheckCVSFiles
+
+  !insertmacro checkFile "$EXEDIR" "cvs95.exe"
+  !insertmacro checkFile "$SYSDIR" "msvcr70.dll"
+  !insertmacro checkFile "$SYSDIR" "msvcp70.dll"
+  !insertmacro checkFile "$EXEDIR" "pserver_protocol.dll"
+  
+  StrCmp ${MISSINGFILES} "" done
+    MessageBox MB_YESNO|MB_ICONQUESTION "NSIS update has to download a few small CVS client files in order to be able to update your NSIS files.$\r$\nThese files only have to be download once. Do you want to download them now?$\r$\n$\r$\nRequired Files: ${MISSINGFILES}" IDYES Done
+    Quit
+    
+  done:
+  
+FunctionEnd
+
+Function CheckCVSDownload
+
+  StrCmp ${MISSINGFILES} "" done
+  
+    SendMessage ${TEMP3} ${WM_SETTEXT} 0 "STR:Downloading CVS client files..."
+  
+    !insertmacro checkFileDownload "$EXEDIR" "cvs95.exe"
+    !insertmacro checkFileDownload "$SYSDIR" "msvcr70.dll"
+    !insertmacro checkFileDownload "$SYSDIR" "msvcp70.dll"
+    !insertmacro checkFileDownload "$EXEDIR" "pserver_protocol.dll"
+    
+  done:
+  
+FunctionEnd
+
+Function CheckCVSData
+
+  IfFileExists "${NSISPATH}\CVS\Root" datainstalled
+    
+    IfFileExists "${NSISPATH}\Bin\InstallCVSData.exe" +3
+      MessageBox MB_OK|MB_ICONSTOP "CVS Data Setup not found."
+      Quit
+    
+    SetDetailsPrint listonly
+    DetailPrint "Installing CVS data..."
+    SetDetailsPrint none
+    Exec "${NSISPATH}\Bin\InstallCVSData.exe"
+
+  datainstalled:
+
+FunctionEnd
+
+Function UpdateMethod
+
+  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "io.ini"
+  
+FunctionEnd
+
+#####################################################################
+# Update (Installer Section)
+
+Section ""
+
+  StrCpy ${NSISPATH} "$EXEDIR\.."
+
+  FindWindow ${TEMP3} "#32770" "" $HWNDPARENT
+  GetDlgItem ${TEMP3} ${TEMP3} 1111
+
+  !insertmacro MUI_INSTALLOPTIONS_READ ${TEMP1} "io.ini" "Field 2" "State"
+  StrCmp ${TEMP1} "1" "" CVS
+  
+    # Check for a new release
+    
+    SetDetailsPrint listonly
+    
+    SendMessage ${TEMP3} ${WM_SETTEXT} 0 "STR:Checking for a new NSIS release..."
+    
+    nsExec::ExecToStack '"${NSISPATH}\makensis.exe" "/version"'
+    Pop ${TEMP1}
+    
+    StrCmp ${TEMP1} "error" "" +3
+      MessageBox MB_OK|MB_ICONSTOP "Can't get NSIS version."
+      Quit
+    
+    Pop ${TEMP1}
+    DetailPrint "Your NSIS version: ${TEMP1}"
+    DetailPrint ""
+    
+    StrCpy ${TEMP2} ${TEMP1} "" -5
+    StrCmp ${TEMP2} "(CVS)" "" NoCVSVersion
+
+      StrLen ${TEMP2} ${TEMP1}
+      IntOp ${TEMP2} ${TEMP2} - 6
+      StrCpy ${TEMP1} ${TEMP1} ${TEMP2}
+      StrCpy ${TEMP2} 1
+      
+      DetailPrint "NOTE: You are using a development version of NSIS."
+      DetailPrint "To get the latest files, use NSIS Update to download the development files."
+      DetailPrint ""
+      
+      Goto CheckUpdate
+    
+    NoCVSVersion:
+    
+      StrCpy ${TEMP2} 0
+    
+    CheckUpdate:
+    
+    DetailPrint "Checking for a new release..."
+    DetailPrint ""
+    
+    NSISdl::download_quiet "http://nsis.sourceforge.net/update.php?version=${TEMP1}&cvs=${TEMP2}" "$PLUGINSDIR\Update"    
+    Pop ${TEMP1}
+     
+    StrCmp ${TEMP1} "success" ReadVersion
+      MessageBox MB_OK|MB_ICONSTOP "Download failed: ${TEMP1}."
+      Quit
+    
+    ReadVersion:
+    
+    FileOpen ${TEMP1} "$PLUGINSDIR\Update" r
+    FileRead ${TEMP1} ${TEMP2}
+    FileClose ${TEMP1}
+
+    StrCmp ${TEMP2} "" "" +3
+      MessageBox MB_OK|MB_ICONSTOP "Invalid version data."
+      Quit
+      
+    StrCpy ${TEMP1} ${TEMP2} 1
+    StrCpy ${TEMP2} ${TEMP2} "" 2
+    
+    SendMessage ${TEMP3} ${WM_SETTEXT} 0 "STR:Task completed."
+    
+    StrCmp ${TEMP1} "1" "" +3
+      DetailPrint "A new stable release is available: ${TEMP2}"
+      Goto UpdateMsg
+    
+    StrCmp ${TEMP1} "2" "" +3
+      DetailPrint "A new preview release is available: ${TEMP2}"
+      Goto UpdateMsg
+      
+    DetailPrint "No new release is available. Check again later."
+    
+    Goto done
+    
+    UpdateMsg:
+    
+    MessageBox MB_YESNO|MB_ICONQUESTION "A new release is available. Would you like to go to the download page?" IDNO done
+    
+      SetDetailsPrint none
+      ExecShell "open" "http://sourceforge.net/project/showfiles.php?group_id=22049"
+      Goto done
+    
+  CVS:
+  
+    # CVS Update
+
+    SetDetailsPrint none
+    
+    SetOutPath ${NSISPATH}
+
+    Call CheckCVSAccess
+    Call CheckCVSFiles
+    Call CheckCVSDownload
+    Call CheckCVSData
+    
+    SetDetailsPrint listonly
+    
+    SendMessage ${TEMP3} ${WM_SETTEXT} 0 "STR:Updating your NSIS files..."
+    
+    DetailPrint "Initializing CVS Update..."
+    
+    !insertmacro MUI_INSTALLOPTIONS_READ ${TEMP1} "io.ini" "Field 3" "State"
+    StrCmp ${TEMP1} "1" "" CleanCVSUpdate
+      
+      # Normal update
+    
+      nsExec::ExecToLog '"$EXEDIR\cvs95.exe" -q -z3 update -d -P'
+      Pop ${TEMP1}
+      Goto CheckCVSReturn
+      
+    CleanCVSUpdate:
+      
+      # Clean copy
+      
+      nsExec::ExecToLog '"$EXEDIR\cvs95.exe" -q -z3 update -C -d -P'
+      Pop ${TEMP1}
+    
+    CheckCVSReturn:
+    
+      StrCmp ${TEMP1} "error" "" +3
+        MessageBox MB_OK|MB_ICONSTOP "Can't execute CVS client."
+        Quit
+        
+    SendMessage ${TEMP3} ${WM_SETTEXT} 0 "STR:Task completed."
+      
+  done:
+  
+  SetDetailsPrint none
+
+SectionEnd
\ No newline at end of file
diff --git a/Contrib/NSIS Update/Resources/BIN/bzip2.exe b/Contrib/NSIS Update/Resources/BIN/bzip2.exe
new file mode 100644
index 00000000..95d05c5f
Binary files /dev/null and b/Contrib/NSIS Update/Resources/BIN/bzip2.exe differ
diff --git a/Contrib/NSIS Update/Resources/GUI/NSISUpdate.exe b/Contrib/NSIS Update/Resources/GUI/NSISUpdate.exe
new file mode 100644
index 00000000..1d424781
Binary files /dev/null and b/Contrib/NSIS Update/Resources/GUI/NSISUpdate.exe differ
diff --git a/Contrib/NSIS Update/Resources/GUI/io.ini b/Contrib/NSIS Update/Resources/GUI/io.ini
new file mode 100644
index 00000000..7eef2a37
--- /dev/null
+++ b/Contrib/NSIS Update/Resources/GUI/io.ini	
@@ -0,0 +1,31 @@
+[Settings]
+NumFields=4
+[Field 1]
+Type=Label
+Text=Welcome to NSIS Update. How would you like to update your NSIS files?
+Left=0
+Right=-1
+Top=0
+Bottom=8
+[Field 2]
+Type=RadioButton
+Text=Check for a new tested release
+Left=20
+Right=-1
+Top=30
+Bottom=38
+State=1
+[Field 3]
+Type=RadioButton
+Text=Download the latest untested development files, merge your changes
+Left=20
+Right=-1
+Top=59
+Bottom=67
+[Field 4]
+Type=RadioButton
+Text=Download the latest untested development files, clean copy
+Left=20
+Right=-1
+Top=88
+Bottom=96
\ No newline at end of file
diff --git a/Examples/cvsdata.nsi b/Examples/cvsdata.nsi
index 787b7acc..eb59679a 100644
--- a/Examples/cvsdata.nsi
+++ b/Examples/cvsdata.nsi
@@ -69,6 +69,10 @@ Section ""
 !insertmacro CVSDATA "Contrib\Makensisw\jnetlib"
 !insertmacro CVSDATA "Contrib\Modern UI"
 !insertmacro CVSDATA "Contrib\Modern UI\Language files"
+!insertmacro CVSDATA "Contrib\NSIS Update"
+!insertmacro CVSDATA "Contrib\NSIS Update\Resources"
+!insertmacro CVSDATA "Contrib\NSIS Update\Resources\BIN"
+!insertmacro CVSDATA "Contrib\NSIS Update\Resources\GUI"
 !insertmacro CVSDATA "Contrib\nsExec"
 !insertmacro CVSDATA "Contrib\NSISdl"
 !insertmacro CVSDATA "Contrib\Splash"