diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 766efd9bb63f86f8afe22730ce3cde8420929329..bd73fbc57865d8f0d0988718e9f701c3b819cc1d 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -103,10 +103,10 @@ static Abi findAbiOfMsvc(MsvcToolChain::Type type, MsvcToolChain::Platform platf
 
     QString msvcVersionString = version;
     if (type == MsvcToolChain::WindowsSDK) {
-        if (version.startsWith(QLatin1String("7.")))
-            msvcVersionString = QLatin1String("10.0");
-        else if (version.startsWith(QLatin1String("6.")))
+        if (version == QLatin1String("v7.0") || version.startsWith(QLatin1String("6.")))
             msvcVersionString = QLatin1String("9.0");
+        else if (version == QLatin1String("v7.0A") || version == QLatin1String("v7.1"))
+            msvcVersionString = QLatin1String("10.0");
     }
     if (msvcVersionString.startsWith(QLatin1String("11.")))
         flavor = Abi::WindowsMsvc2012Flavor;
@@ -492,7 +492,6 @@ QList<ToolChain *> MsvcToolChainFactory::autoDetect()
     if (!defaultSdkPath.isEmpty()) {
         foreach (const QString &sdkKey, sdkRegistry.childGroups()) {
             const QString name = sdkRegistry.value(sdkKey + QLatin1String("/ProductName")).toString();
-            const QString version = sdkRegistry.value(sdkKey + QLatin1String("/ProductVersion")).toString();
             const QString folder = sdkRegistry.value(sdkKey + QLatin1String("/InstallationFolder")).toString();
             if (folder.isEmpty())
                 continue;
@@ -506,14 +505,14 @@ QList<ToolChain *> MsvcToolChainFactory::autoDetect()
 
             QList<ToolChain *> tmp;
             tmp.append(new MsvcToolChain(generateDisplayName(name, MsvcToolChain::WindowsSDK, MsvcToolChain::x86),
-                                         findAbiOfMsvc(MsvcToolChain::WindowsSDK, MsvcToolChain::x86, version),
+                                         findAbiOfMsvc(MsvcToolChain::WindowsSDK, MsvcToolChain::x86, sdkKey),
                                          fi.absoluteFilePath(), QLatin1String("/x86"), true));
             // Add all platforms, cross-compiler is automatically selected by SetEnv.cmd if needed
             tmp.append(new MsvcToolChain(generateDisplayName(name, MsvcToolChain::WindowsSDK, MsvcToolChain::amd64),
-                                         findAbiOfMsvc(MsvcToolChain::WindowsSDK, MsvcToolChain::amd64, version),
+                                         findAbiOfMsvc(MsvcToolChain::WindowsSDK, MsvcToolChain::amd64, sdkKey),
                                          fi.absoluteFilePath(), QLatin1String("/x64"), true));
             tmp.append(new MsvcToolChain(generateDisplayName(name, MsvcToolChain::WindowsSDK, MsvcToolChain::ia64),
-                                         findAbiOfMsvc(MsvcToolChain::WindowsSDK, MsvcToolChain::ia64, version),
+                                         findAbiOfMsvc(MsvcToolChain::WindowsSDK, MsvcToolChain::ia64, sdkKey),
                                          fi.absoluteFilePath(), QLatin1String("/ia64"), true));
             // Make sure the default is front.
             if (folder == defaultSdkPath)