diff --git a/maintainers/scripts/map-files.pl b/maintainers/scripts/map-files.pl
new file mode 100644
index 00000000000..96149a61549
--- /dev/null
+++ b/maintainers/scripts/map-files.pl
@@ -0,0 +1,22 @@
+#! /usr/bin/perl -w
+
+use strict;
+
+my %map;
+open LIST1, "<$ARGV[0]" or die;
+while (<LIST1>) {
+    /^(\S+)\s+(.*)$/;
+    $map{$1} = $2;
+}
+
+open LIST1, "<$ARGV[1]" or die;
+while (<LIST1>) {
+    /^(\S+)\s+(.*)$/;
+    if (!defined $map{$1}) {
+        print STDERR "missing file: $2\n";
+        next;
+    }
+    print "$2\n";
+    print "$map{$1}\n";
+}
+
diff --git a/pkgs/development/compilers/visual-c++/builder.sh b/pkgs/development/compilers/visual-c++/builder.sh
index eb1cfd41b93..cacf14f3077 100644
--- a/pkgs/development/compilers/visual-c++/builder.sh
+++ b/pkgs/development/compilers/visual-c++/builder.sh
@@ -1,8 +1,23 @@
 source $stdenv/setup
 
 ensureDir $out
+
+cabextract $src
+
+mkdir tmp
+cd tmp
+cabextract ../vcsetup1.cab
+rm ../vc* # reduce temporary disk usage a bit
+
+while read target; do
+    read source
+    echo "$source -> $target"
+    ensureDir $out/$(dirname $target)
+    cp "$source" $out/"$target"
+done < $filemap
+
 cat > $out/setup  <<EOF
-export PATH="$vs8Path/VC/bin:$vs8Path/Common7/IDE:$sdkPath/bin:\$PATH"
-export LIB="$(cygpath -w -p "$vs8Path/VC/lib:$sdkPath/lib")"
-export INCLUDE="$(cygpath -w -p "$sdkPath/include:$sdkPath/include/crt")"
+export PATH="$out/VC/bin:$out/Common7/IDE:$sdkPath/bin:\$PATH"
+export LIB="$(cygpath -w -p "$out/VC/lib:$sdkPath/lib")"
+export INCLUDE="$(cygpath -w -p "$out/VC/include:$sdkPath/include")"
 EOF
diff --git a/pkgs/development/compilers/visual-c++/default.nix b/pkgs/development/compilers/visual-c++/default.nix
index efae5799b2f..f3a8bf5066b 100644
--- a/pkgs/development/compilers/visual-c++/default.nix
+++ b/pkgs/development/compilers/visual-c++/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, cabextract}:
 
 assert stdenv.system == "i686-cygwin";
 
@@ -8,7 +8,24 @@ stdenv.mkDerivation {
   name = "visual-c++-8-14.00.50727.42";
   builder = ./builder.sh;
 
+  src = fetchurl {
+    url = http://download.microsoft.com/download/0/5/A/05AA45B9-A4BE-4872-8D57-733DF5297284/Ixpvc.exe;
+    md5 = "5b3b07cb048798822582a752f586bab9";
+  };
+
+  # The `filemap' maps the pretty much useless paths in the CAB file
+  # to their intended destinations in the file system, as determined
+  # from a normal Visual C++ Express installation.
+  #
+  # Recipe for reproducing:
+  # $ find -type f /path/to/unpacked-cab -print0 | xargs -0 md5sum > m1
+  # $ find -type f /path/to/visual-c++ -print0 | xargs -0 md5sum > m2
+  # $ nixpkgs/maintainers/scripts/map-files.pl m1 m2 > filemap
+  filemap = ./filemap;
+
+  buildInputs = [cabextract];
+
   # These should be downloaded eventually.
-  vs8Path = "/cygdrive/c/Program Files/Microsoft Visual Studio 8";
+#  vs8Path = "/cygdrive/c/Program Files/Microsoft Visual Studio 8";
   sdkPath = "/cygdrive/c/Program Files/Microsoft Platform SDK";
 }
diff --git a/pkgs/development/compilers/visual-c++/filemap b/pkgs/development/compilers/visual-c++/filemap
new file mode 100644
index 00000000000..9f17745e737
--- /dev/null
+++ b/pkgs/development/compilers/visual-c++/filemap
@@ -0,0 +1,622 @@
+./Common7/IDE/msobj80.dll
+./FL_msobj71_dll_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/mspdb80.dll
+./FL_mspdb71_dll_2_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/mspdbcore.dll
+./FL_mspdbcore_dll_92167_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/mspdbsrv.exe
+./FL_mspdbsrv_exe_92168_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/PEVerify.exe
+./FL_PEVerify_exe_142183_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/PEVerify.exe.config
+./FL_PEVerify_exe_config_142184________.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/PublicAssemblies/CppCodeProvider.dll
+./FL_CppCodeProvider_dll_72654_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/PublicAssemblies/Microsoft.VisualC.VSCodeProvider.dll
+./FL_Microsoft_VisualC_VSCodeProvider_dll_72653_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCCodeModel.dll
+./Microsoft_VisualStudio_VCCodeModel_dll_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCCodeModel.xml
+./FL_Microsoft_VisualStudio_VCCodeModel_xml_141601_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCProject.dll
+./Microsoft_VisualStudio_VCProject_dll_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCProject.xml
+./FL_Microsoft_VisualStudio_VCProject_xml_141602_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCProjectEngine.dll
+./FL_Microsoft_VisualStudio_VCProjectEngine__72652_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCProjectEngine.xml
+./FL_Microsoft_VisualStudio_VCProjectEngine__141603_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/Tools/errlook.exe
+./FL_errlook_exe_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/Tools/errlook.hlp
+./FL_errlook_hlp_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/Tools/makehm.exe
+./FL_makehm_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./Common7/Tools/vcvars.txt
+./FL_vcvars32_bat_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/AxImp.exe
+./FL_AxImp_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/gacutil.exe
+./FL_gacutil_exe_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/gacutil.exe.config
+./FL_PEVerify_exe_config_142184________.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/lc.exe
+./FL_lc_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/PEVerify.exe
+./FL_PEVerify_exe_142183_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/PEVerify.exe.config
+./FL_PEVerify_exe_config_142184________.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/ResGen.exe
+./FL_ResGen_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/sgen.exe
+./FL_sgen_exe_94980_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/signtool.exe
+./FL_signtool_exe_102951_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/sn.exe
+./FL_sn_exe_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/TlbExp.exe
+./FL_TlbExp_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/TlbImp.exe
+./TlbImp_exe_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/TlbRef.dll
+./FL_TlbRef_dll_91955_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/wsdl.exe
+./FL_wsdl_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/wsdl.exe.config
+./FL_PEVerify_exe_config_142184________.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Bin/xsd.exe
+./FL_xsd_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./SDK/v2.0/Lib/mscoree.lib
+./mscoree_lib_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/1033/atlprovui.dll
+./FL_atlprovui_dll_122786_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/1033/bscmakeui.dll
+./FL_bscmakeui_dll_103043_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/1033/clui.dll
+./FL_clui_dll_95594_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/1033/cvtresui.dll
+./FL_cvtresui_dll_103020_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/1033/linkui.dll
+./FL_linkui_dll_102968_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/1033/nmakeui.dll
+./FL_nmakeui_dll_103025_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/atlprov.dll
+./FL_atlprov_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/bscmake.exe
+./FL_bscmake_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/c1.dll
+./FL_c1_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/c1xx.dll
+./FL_c1xx_dll_67102_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/c2.dll
+./FL_c2_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/cl.exe
+./FL_cl_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/cl.exe.config
+./FL_xdcmake_exe_config_76491_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/cvtres.exe
+./cvtres_exe_4_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/dumpbin.exe
+./FL_dumpbin_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/editbin.exe
+./FL_editbin_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/lib.exe
+./FL_lib_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/link.exe
+./FL_link_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/link.exe.config
+./FL_xdcmake_exe_config_76491_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/nmake.exe
+./FL_nmake_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/rc.exe
+./rc_exe_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/rcdll.dll
+./FL_rcdll_dll_66416_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/undname.exe
+./FL_undname_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/VCExpCmdPromptShortcut.txt
+./FL_blank_txt_120872________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/vcvars32.bat
+./vcvars32_bat_1________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/xdcmake.exe
+./FL_xdcmake_exe_76490_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/bin/xdcmake.exe.config
+./FL_xdcmake_exe_config_76491_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/delayhlp.cpp
+./FL_delayhlp_cpp________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/intrin.h
+./FL_intrin_h_106236_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/memory.h
+./FL_memory_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/time.h
+./FL_time_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/algorithm
+./FL_algrithm________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/assert.h
+./FL_assert_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/bitset
+./FL_bitset________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cassert
+./FL_cassert________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cctype
+./FL_cctype________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cerrno
+./FL_cerrno________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cfloat
+./FL_cfloat________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/ciso646
+./FL_ciso646________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/climits
+./FL_climits________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/clocale
+./FL_clocale________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cmath
+./FL_cmath________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/CodeAnalysis/sourceannotations.h
+./FL_sourceannotations_h_126529________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/comdef.h
+./FL_comdef_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/comdefsp.h
+./FL_comdefsp_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/comip.h
+./FL_comip_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/complex
+./FL_complex________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/comutil.h
+./FL_comutil_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/conio.h
+./FL_conio_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/crtassem.h
+./FL_crtassem_h_115581_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/crtdbg.h
+./FL_crtdbg_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/crtdefs.h
+./FL_crtdefs_h_92449_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/crtwrn.h
+./FL_crtwrn_h_110314_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/csetjmp
+./FL_csetjmp________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/csignal
+./FL_csignal________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cstdarg
+./FL_cstdarg________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cstddef
+./FL_cstddef________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cstdio
+./FL_cstdio________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cstdlib
+./FL_cstdlib________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cstring
+./FL_cstring________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/ctime
+./FL_ctime________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/ctype.h
+./FL_ctype_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cwchar
+./FL_cwchar________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/cwctype
+./FL_cwctype________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/dbgautoattach.h
+./dbgautoattach_h_2________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/minmax.h
+./FL_minmax_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/mm3dnow.h
+./FL_mm3dnow_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/mmintrin.h
+./FL_mmintrin_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/msclr/all.h
+./FL_all_h_120615________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/msclr/appdomain.h
+./FL_appdomain_h_120616________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/msclr/auto_gcroot.h
+./FL_auto_gcroot_h_120617________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/msclr/auto_handle.h
+./FL_auto_handle_h_120618________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/msclr/com/ptr.h
+./FL_ptr_h_120621________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/msclr/event.h
+./FL_event_h_122275________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/msclr/gcroot.h
+./FL_gcroot_h_134688________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/msclr/lock.h
+./FL_lock_h_120619________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/msclr/safebool.h
+./FL_safebool_h_120620________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/new
+./FL_new________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/new.h
+./FL_new_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/numeric
+./FL_numeric________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/ostream
+./FL_ostream________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/penwin.h
+./FL_penwin_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/process.h
+./FL_process_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/queue
+./FL_queue________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/rtcapi.h
+./rtcapi_h_1________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sal.h
+./FL_sal_h_122276_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/search.h
+./FL_search_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/set
+./FL_set________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/setjmp.h
+./FL_setjmp_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/setjmpex.h
+./FL_setjmpex_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/share.h
+./FL_share_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/signal.h
+./FL_signal_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sstream
+./FL_sstream________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/stack
+./FL_stack________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/stdarg.h
+./FL_stdarg_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/stddef.h
+./FL_stddef_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/stdexcept
+./FL_stdxcept________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/stdexcpt.h
+./FL_stdexcpt_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/stdio.h
+./FL_stdio_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/stdlib.h
+./FL_stdlib_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/streambuf
+./FL_streambf________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/string
+./FL_string________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/string.h
+./FL_string_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/strstream
+./FL_strstrem________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/swprintf.inl
+./FL_swprintf_inl_114606_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sys/locking.h
+./locking_h_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sys/stat.h
+./stat_h_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sys/stat.inl
+./FL_stat_inl_73772_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sys/timeb.h
+./timeb_h_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sys/timeb.inl
+./FL_timeb_inl_73773_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sys/types.h
+./types_h_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sys/utime.h
+./utime_h_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sys/utime.inl
+./FL_utime_inl_73774_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/sys/wstat.inl
+./FL_wstat_inl_73775_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/tchar.h
+./FL_tchar_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/delayimp.h
+./FL_delayimp_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/deque
+./FL_deque________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/direct.h
+./FL_direct_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/dos.h
+./FL_dos_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/dvec.h
+./FL_dvec_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/eh.h
+./FL_eh_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/emmintrin.h
+./FL_emmintrin_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/errno.h
+./FL_errno_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/exception
+./FL_xception________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/excpt.h
+./FL_excpt_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/fcntl.h
+./FL_fcntl_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/float.h
+./FL_float_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/fpieee.h
+./FL_fpieee_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/fstream
+./FL_fstream________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/functional
+./FL_fctional________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/fvec.h
+./FL_fvec_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/gcroot.h
+./FL_gcroot_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/hash_map
+./FL_hash_map________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/hash_set
+./FL_hash_set________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/time.inl
+./FL_time_inl_73769_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/typeinfo
+./FL_typeinfo________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/typeinfo.h
+./FL_typeinfo_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/use_ansi.h
+./FL_use_ansi_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/utility
+./FL_utility________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/vadefs.h
+./FL_vadefs_h_76352_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/valarray
+./FL_valarray________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/varargs.h
+./FL_varargs_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/vcclr.h
+./FL_vcclr_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/vector
+./FL_vector________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/wchar.h
+./FL_wchar_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/wctype.h
+./FL_wctype_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/wtime.inl
+./FL_wtime_inl_73771_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xcomplex
+./FL_xcomplex________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xdebug
+./FL_xdebug________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xhash
+./FL_xhash________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xiosbase
+./FL_xiosbase________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xlocale
+./FL_xlocale________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xlocinfo
+./FL_xlocinfo________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xlocinfo.h
+./FL_xlocinfo_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xlocmes
+./FL_xlocmes________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xlocmon
+./FL_xlocmon________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xlocnum
+./FL_xlocnum________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xloctime
+./FL_xloctime________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xmath.h
+./FL_xmath_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xmemory
+./FL_xmemory________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xmmintrin.h
+./FL_xmmintrin_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xstddef
+./FL_xstddef________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xstring
+./FL_xstring________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xtree
+./FL_xtree________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/xutility
+./FL_xutility________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/ymath.h
+./FL_ymath_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/yvals.h
+./FL_yvals_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/_vcclrit.h
+./FL__vcclrit_h_103662_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/invkprxy.h
+./FL_invkprxy_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/io.h
+./FL_io_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/iomanip
+./FL_iomanip________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/ios
+./FL_ios________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/iosfwd
+./FL_iosfwd________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/iostream
+./FL_iostream________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/iso646.h
+./FL_iso646_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/istream
+./FL_istream________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/iterator
+./FL_iterator________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/ivec.h
+./FL_ivec_h________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/limits
+./FL_limits________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/limits.h
+./FL_limits_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/list
+./FL_list________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/listing.inc
+./listing_inc_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/locale
+./FL_locale________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/locale.h
+./FL_locale_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/malloc.h
+./FL_malloc_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/map
+./FL_map________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/math.h
+./FL_math_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/mbctype.h
+./FL_mbctype_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/mbstring.h
+./FL_mbstring_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/include/memory
+./FL_memory________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/msvcprtd.lib
+./FL_msvcprtd_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/binmode.obj
+./FL_binmode_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/chkstk.obj
+./chkstk_obj_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/commode.obj
+./FL_commode_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/comsupp.lib
+./FL_comsupp_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/comsuppd.lib
+./comsuppd_lib_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/comsuppw.lib
+./FL_comsuppw_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/comsuppwd.lib
+./FL_comsuppwd_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/delayimp.lib
+./FL_delayimp_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/fp10.obj
+./FL_fp10_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/invalidcontinue.obj
+./FL_invalidcontinue_obj_117316_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/kernel32.lib
+./FL_kernel32_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/libcmt.lib
+./FL_libcmt_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/libcmt.pdb
+./FL_libcmt_pdb_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/libcmtd.lib
+./FL_libcmtd_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/libcmtd.pdb
+./FL_libcmtd_pdb_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/libcpmt.lib
+./FL_libcpmt_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/libcpmt.pdb
+./FL_libcpmt_pdb_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/libcpmtd.lib
+./FL_libcpmtd_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/libcpmtd.pdb
+./FL_libcpmtd_pdb_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/libsmanifest.res
+./FL_libsmanifest_res_111130________.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/loosefpmath.obj
+./FL_loosefpmath_obj_106228_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/msvcmrt.lib
+./FL_msvcmrt_lib_92271_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/msvcmrtd.lib
+./FL_msvcmrtd_lib_92272_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/msvcprt.lib
+./FL_msvcprt_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/msvcrt.lib
+./FL_msvcrt_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/msvcrtd.lib
+./FL_msvcrtd_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/msvcurt.lib
+./FL_msvcurt_lib_102954_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/msvcurtd.lib
+./FL_msvcurtd_lib_102955_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/newmode.obj
+./FL_newmode_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/noarg.obj
+./FL_noarg_obj_126544_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/nochkclr.obj
+./FL_nochkclr_obj_110315_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/noenv.obj
+./FL_noenv_obj_126545_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/nothrownew.obj
+./FL_nothrownew_obj_97867_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/oldnames.lib
+./FL_oldnames_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/opends60.lib
+./FL_opends60_lib_127616_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/pbinmode.obj
+./FL_pbinmode_obj_125244_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/pcommode.obj
+./FL_pcommode_obj_125245_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/pinvalidcontinue.obj
+./FL_pinvalidcontinue_obj_125246_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/pnewmode.obj
+./FL_pnewmode_obj_125247_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/pnoarg.obj
+./FL_pnoarg_obj_125248_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/pnoenv.obj
+./FL_pnoenv_obj_125249_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/pnothrownew.obj
+./FL_pnothrownew_obj_125250_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/psetargv.obj
+./FL_psetargv_obj_125251_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/pthreadlocale.obj
+./FL_pthreadlocale_obj_125252_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/ptrustm.lib
+./FL_ptrustm_lib_136980_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/ptrustmd.lib
+./FL_ptrustmd_lib_136981_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/ptrustu.lib
+./FL_ptrustu_lib_136982_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/ptrustud.lib
+./FL_ptrustud_lib_136983_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/pwsetargv.obj
+./FL_pwsetargv_obj_125253_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/RunTmChk.lib
+./FL_RunTmChk_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/setargv.obj
+./FL_setargv_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/smalheap.obj
+./FL_smalheap_obj_126541_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/threadlocale.obj
+./FL_threadlocale_obj_126542_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/lib/wsetargv.obj
+./FL_wsetargv_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/vcpackages/1033/vcbuildui.dll
+./FL_vcbuildui_dll_113019_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/vcpackages/1033/VCProjectUI.dll
+./FL_prjbldui_dll_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/vcpackages/vcbuild.exe
+./FL_vsbuild_exe_75031_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/vcpackages/VCProjectEngine.dll.config
+./FL_VCProjectEngine_dll_config_93244_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/vcpackages/VCProjectEngine.Dll.Express.Config
+./FL_VCProjectEngine_Dll_Express_Config_109708_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/ATLDynamic.vsprops
+./FL_ATLDynamic_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/ATLNoCRT.vsprops
+./FL_ATLNoCRT_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/ATLStatic.vsprops
+./FL_ATLStatic_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/ATLWithCRT.vsprops
+./FL_ATLWithCRT_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/BuildBsc.vsprops
+./FL_BuildBsc_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/CoreWin.vsprops
+./FL_CoreWin_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/corewin_express.vsprops
+./FL_corewin_express_vsprops_104010_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/ManagedExtensions.vsprops
+./FL_ManagedExtensions_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/ManagedExtensionsOldSyntax.vsprops
+./FL_ManagedExtensionsOldSyntax_vsprops_103909_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/ManagedExtensionsPure.vsprops
+./FL_ManagedExtensionsPure_vsprops_103907_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/ManagedExtensionsSafe.vsprops
+./FL_ManagedExtensionsSafe_vsprops_103908_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/MfcDynamic.vsprops
+./FL_MfcDynamic_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/MfcStatic.vsprops
+./FL_MfcStatic_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/MultiByteCharSupport.vsprops
+./FL_MultiByteCharSupport_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/pgoinstrument.vsprops
+./FL_pgoinstrument_vsprops_92166_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/pgooptimize.vsprops
+./FL_pgooptimize_vsprops_92165_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/pgoupdate.vsprops
+./FL_pgoupdate_vsprops_92935_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/StaticAnalysis.vsprops
+./FL_StaticAnalysis_vsprops_122128_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/UnicodeSupport.vsprops
+./FL_UnicodeSupport_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/UpgradeFromVC60.vsprops
+./FL_UpgradeFromVC60_vsprops_123105_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/UpgradeFromVC70.vsprops
+./FL_UpgradeFromVC70_vsprops_123106_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/UpgradeFromVC71.vsprops
+./FL_UpgradeFromVC71_vsprops_123107_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/VCMergeModules.xml
+./FL_VCMergeModules_xml_120801_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/WholeProgOptimize.vsprops
+./FL_WholeProgOptimize_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/VCProjectDefaults/WinDLL.vsprops
+./FL_WinDLL_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
+./VC/vcvarsall.bat
+./FL_vcvarsall_bat_103803________.3643236F_FC70_11D3_A536_0090278A1BB8
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81980378a2a..8de0dbed438 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -829,7 +829,7 @@ rec {
   };
 
   visualcpp = import ../development/compilers/visual-c++ {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv cabextract;
   };
 
   win32hello = import ../development/compilers/visual-c++/test {