--- Config.pm_orig	Mon Jul 23 13:49:44 2007
+++ Config.pm	Sat May 10 19:33:34 2008
@@ -81,7 +81,11 @@
     }
 
     if ($COMPILER_ENV{$key} && !$compiler_env_initialized++) {
-	if ($^O eq "MSWin32" && (_gcc_requested() || !find_prog(_orig_conf("cc")))) {
+       if ($^O eq "MSWin32" && !_gcc_requested() && find_prog(_orig_conf("cc"))) {
+          my @ccversion = split / /, `cl 2>&1`;
+          _override("ccversion", $ccversion[7]);
+       }
+	elsif ($^O eq "MSWin32" && (_gcc_requested() || !find_prog(_orig_conf("cc")))) {
 	    if (my $gcc = find_prog("gcc")) {
 		# assume MinGW or similar is available
 		$gcc =~ s,\\,/,g;