diff --git a/CHANGELOG b/CHANGELOG
index bb65c412a..b0c860cea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,17 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o The Nmap Windows self-installer now automatically installs the MS
+  Visual C++ 2008 runtime components if they aren't already installed
+  on a system.  These are some reasonably small DLLs that are
+  generally necessary for applications compiled with Visual C++ (with
+  dynamic linking).  Many or most systems already have these installed
+  from other software packages.  The lack of these components led to
+  the error message "The Application failed to intialize properly
+  (0xc0150002)." with Nmap 4.65.  A related change is that Nmap on
+  Windows is now compiled with /MD rather than /MT so that it
+  consistently uses these runtime libraries.  The patch was created by
+  Rob Nicholls.
+
 o Updated showHTMLTitle NSE script to follow one HTTP redirect if
   necessary as long as it is on the same server. [Jah]
 
diff --git a/libdnet-stripped/libdnet-stripped.vcproj b/libdnet-stripped/libdnet-stripped.vcproj
index f5d5bb8ca..ca1e29c37 100755
--- a/libdnet-stripped/libdnet-stripped.vcproj
+++ b/libdnet-stripped/libdnet-stripped.vcproj
@@ -110,7 +110,7 @@
 				AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE""
 				AdditionalIncludeDirectories="include;"..\mswin32\pcap-include""
 				PreprocessorDefinitions="WIN32;_LIB"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
diff --git a/liblua/liblua.vcproj b/liblua/liblua.vcproj
index 5c470c45b..b4bd2d679 100644
--- a/liblua/liblua.vcproj
+++ b/liblua/liblua.vcproj
@@ -119,7 +119,7 @@
 				MinimalRebuild="false"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="false"
 				RuntimeTypeInfo="false"
diff --git a/libpcre/libpcre.vcproj b/libpcre/libpcre.vcproj
index d84dc41f3..9b6a391ba 100644
--- a/libpcre/libpcre.vcproj
+++ b/libpcre/libpcre.vcproj
@@ -106,7 +106,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;_LIB"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
diff --git a/mswin32/Makefile b/mswin32/Makefile
index da9ffabc2..14f06c883 100644
--- a/mswin32/Makefile
+++ b/mswin32/Makefile
@@ -29,6 +29,7 @@ winbuild:
 	cp -a Release/nselib nmap-$(NMAP_VERSION)
 	cp -a Release/nselib-bin nmap-$(NMAP_VERSION)
 	cp winpcap/winpcap-nmap-*.exe nmap-$(NMAP_VERSION)
+	cp vcredist_x86.exe nmap-$(NMAP_VERSION)
 	zip -r nmap-$(NMAP_VERSION)-win32.zip nmap-$(NMAP_VERSION)
 	mkdir nmap-$(NMAP_VERSION)/zenmap
 	cd ../zenmap && install_scripts/windows/copy_and_compile.bat
diff --git a/mswin32/nmap.vcproj b/mswin32/nmap.vcproj
index 9bee85fd4..f33e478d0 100644
--- a/mswin32/nmap.vcproj
+++ b/mswin32/nmap.vcproj
@@ -144,7 +144,7 @@
 				AdditionalIncludeDirectories=".;..;../liblua;../nbase;../libpcre;winip;..\nsock\include;&quot;pcap-include&quot;;&quot;..\libdnet-stripped\include&quot;;OpenSSL\include;"
 				PreprocessorDefinitions="WIN32;_CONSOLE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/nmap.pch"
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 4153840fa..edb032fbc 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -172,7 +172,12 @@ Section "Nmap Core Files" SecCore
   
   ;Store installation folder 
   WriteRegStr HKCU "Software\Nmap" "" $INSTDIR 
-   
+
+  ;Silent install of Visual C++ 2008 runtime components
+  File ..\vcredist_x86.exe
+  ExecWait '"$INSTDIR\vcredist_x86.exe" /q'
+  Delete "$INSTDIR\vcredist_x86.exe" 
+
   ;Create uninstaller 
   WriteUninstaller "$INSTDIR\Uninstall.exe" 
    
@@ -232,7 +237,7 @@ SectionEnd
 ;Descriptions 
  
   ;Component strings 
-  LangString DESC_SecCore ${LANG_ENGLISH} "Installs Nmap executable and NSE scripts" 
+  LangString DESC_SecCore ${LANG_ENGLISH} "Installs Nmap executable, NSE scripts and Visual C++ 2008 runtime components"
   LangString DESC_SecRegisterPath ${LANG_ENGLISH} "Registers Nmap path to System path so you can execute it from any directory" 
   LangString DESC_SecWinPcap ${LANG_ENGLISH} "Installs WinPcap 4.0 (required for most Nmap scans unless it is already installed)" 
   LangString DESC_SecPerfRegistryMods ${LANG_ENGLISH} "Modifies Windows registry values to improve TCP connect scan performance.  Recommended." 
diff --git a/mswin32/vcredist_x86.exe b/mswin32/vcredist_x86.exe
new file mode 100644
index 000000000..b8a3da8d8
Binary files /dev/null and b/mswin32/vcredist_x86.exe differ