diff --git a/setup/pykd_logo.png b/setup/pykd_logo.png
new file mode 100644
index 0000000..19c304c
Binary files /dev/null and b/setup/pykd_logo.png differ
diff --git a/setup/pykd_setup_common.nsh b/setup/pykd_setup_common.nsh
index 5d93c3d..4e3070a 100644
--- a/setup/pykd_setup_common.nsh
+++ b/setup/pykd_setup_common.nsh
@@ -27,7 +27,7 @@ SetCompressor LZMA
 
 !define PRODUCT_SHORT_NAME "pykd"
 !define PRODUCT_FULL_NAME  "Python extension for WinDbg"
-!define PRODUCT_VERSION "0.0.0.18"
+!define PRODUCT_VERSION "0.0.0.19"
 !define PRODUCT_URL  "http://pykd.codeplex.com/"
 !define PRODUCT_NAME_AND_VERSION "${PRODUCT_FULL_NAME} ${PRODUCT_ARCH} ${PRODUCT_VERSION}"
 !define PRODUCT_MANUFACTURER "PyKd Team"
@@ -135,7 +135,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion"     "${PRODUCT_VERSION}"
 !macro _IsVcRuntimeInstalled _a _b _t _f
     !insertmacro _LOGICLIB_TEMP
     Push 'msvcr80.dll'
-    Push 'Microsoft.VC80.CRT,version="8.0.50727.4053",type="win32",processorArchitecture="${ARCH}",publicKeyToken="1fc8b3b9a1e18e3b"'
+    Push 'Microsoft.VC80.CRT,version="8.0.50727.6195",type="win32",processorArchitecture="${ARCH}",publicKeyToken="1fc8b3b9a1e18e3b"'
     ${WinSxS_HasAssembly}
     Pop $_LOGICLIB_TEMP
     !insertmacro _== $_LOGICLIB_TEMP 1 `${_t}` `${_f}`
@@ -218,23 +218,23 @@ Section "Python ${PYTHON_VERSION} ${PRODUCT_ARCH}" sec_python
 SectionEnd
 
 Section "Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime" sec_vcruntime
-    DetailPrint "Downloading Microsoft Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime library..."
-    inetc::get /CAPTION "${PRODUCT_SHORT_NAME}" /QUESTION "" /POPUP "" /TIMEOUT=30000 "${VCRUNTIME_URL}" "$TEMP\vcredist_${PRODUCT_ARCH}.exe" /END
-    Pop $0
-    ${If} $0 == "OK" 
-        DetailPrint "Successfully downloaded."
-        DetailPrint "Installing Microsoft Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime library..."
-        IfErrors ClearErrorFlag
-        ClearErrorFlag:
-        ExecWait "$TEMP\vcredist_${PRODUCT_ARCH}.exe"
-        IfErrors RuntimeInstallFailed
-        DetailPrint "Successfully installed."
-    ${Else}
-        RuntimeInstallFailed:
-        DetailPrint "Operation failed. Installation will be continued without Visual C++ runtime."
-        DetailPrint "Please download and install it manually from product download page:"
-        DetailPrint "${VCRUNTIME_URL}"
-    ${EndIf}
+    DetailPrint "Installing Microsoft Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime library..."
+
+    SetOutPath "$TEMP"
+    !if ${PRODUCT_ARCH} == "x64"
+        File "..\x64\Release\vcredist_${PRODUCT_ARCH}.exe"
+    !else
+        File "..\Release\vcredist_${PRODUCT_ARCH}.exe"
+    !endif
+
+    ExecWait "$TEMP\vcredist_${PRODUCT_ARCH}.exe"
+    IfErrors RuntimeInstallFailed
+    DetailPrint "Successfully installed."
+    Return
+
+    RuntimeInstallFailed:
+    DetailPrint "Operation failed. Installation will be continued without Visual C++ runtime."
+    DetailPrint "Please download and install it manually."
 SectionEnd
 
 Section -FinishSection
diff --git a/setup/pykd_setup_x64.nsi b/setup/pykd_setup_x64.nsi
index 13537bd..76521ef 100644
--- a/setup/pykd_setup_x64.nsi
+++ b/setup/pykd_setup_x64.nsi
@@ -9,9 +9,7 @@
 !define PYTHON_INSTALLER "python-2.6.6.amd64.msi"
 !define PYTHON_PRODUCT_CODE "{6151CF20-0BD8-4023-A4A0-6A86DCFE58E6}"
 
-# Source http://www.microsoft.com/downloads/en/details.aspx?FamilyID=766a6af7-ec73-40ff-b072-9112bab119c2
 # When changing VC runtime vesion don't forget to update ProductCode appropriately
-!define VCRUNTIME_URL "http://download.microsoft.com/download/6/B/B/6BB661D6-A8AE-4819-B79F-236472F6070C/vcredist_x64.exe"
-!define VCRUNTIME_PRODUCT_CODE "{6ce5bae9-d3ca-4b99-891a-1dc6c118a5fc}"
+!define VCRUNTIME_PRODUCT_CODE "{ad8a2fa1-06e7-4b0d-927d-6e54b3d31028}"
 
 !include "pykd_setup_common.nsh"
diff --git a/setup/pykd_setup_x86.nsi b/setup/pykd_setup_x86.nsi
index dd5967e..5b19973 100644
--- a/setup/pykd_setup_x86.nsi
+++ b/setup/pykd_setup_x86.nsi
@@ -9,9 +9,7 @@
 !define PYTHON_INSTALLER "python-2.6.6.msi"
 !define PYTHON_PRODUCT_CODE "{6151CF20-0BD8-4023-A4A0-6A86DCFE58E5}"
 
-# Source http://www.microsoft.com/downloads/en/details.aspx?FamilyID=766a6af7-ec73-40ff-b072-9112bab119c2
 # When changing VC runtime vesion don't forget to update ProductCode appropriately
-!define VCRUNTIME_URL "http://download.microsoft.com/download/6/B/B/6BB661D6-A8AE-4819-B79F-236472F6070C/vcredist_x86.exe"
-!define VCRUNTIME_PRODUCT_CODE "{837b34e3-7c30-493c-8f6a-2b0f04e2912c}"
+!define VCRUNTIME_PRODUCT_CODE "{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}"
 
 !include "pykd_setup_common.nsh"