Index: /mpich2/trunk/winconfigure.wsf
===================================================================
--- /mpich2/trunk/winconfigure.wsf (revision 4862)
+++ /mpich2/trunk/winconfigure.wsf (revision 4883)
@@ -6604,11 +6604,4 @@
         mfile.WriteLine("mpi_mod: $(FORT_OUTDIR) $(mpi_mod_objs)")
         mfile.WriteLine
-	mfile.WriteLine("!IF ""$(CPU)"" != ""x86""")
-	mfile.WriteLine("# Only one calling convention for Win64 so gfort and sfort are not necessary")
-	mfile.WriteLine("gfort: $(GFORT_OUTDIR)")
-	mfile.WriteLine
-	mfile.WriteLine("sfort: $(SFORT_OUTDIR)")
-	mfile.WriteLine
-	mfile.WriteLine("!ELSE")
 	outdir = "GFORT_OUTDIR"
 	extra_flags = "$(gfcflags)"
@@ -6622,4 +6615,9 @@
 	mfile.WriteLine("gfort: $(GFORT_OUTDIR) $(GFORT_OUTDIR)\fmpich2g$(D).dll")
 	mfile.WriteLine
+	mfile.WriteLine("!IF ""$(CPU)"" != ""x86""")
+	mfile.WriteLine("# We don't build sfort for non-x86 platforms")
+	mfile.WriteLine("sfort: $(SFORT_OUTDIR)")
+	mfile.WriteLine
+	mfile.WriteLine("!ELSE")
 	outdir = "SFORT_OUTDIR"
 	extra_flags = "$(sfcflags)"
Index: /mpich2/trunk/maint/mpich2x64i.vdproj
===================================================================
--- /mpich2/trunk/maint/mpich2x64i.vdproj (revision 4591)
+++ /mpich2/trunk/maint/mpich2x64i.vdproj (revision 4883)
@@ -28,4 +28,10 @@
         "Entry"
         {
+        "MsmKey" = "8:_16898359DEFD4ED5A9AA75F627C67BFF"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_18D946452B7F4DBB81818445A0BC79D1"
         "OwnerKey" = "8:_UNDEFINED"
@@ -257,4 +263,10 @@
         {
         "MsmKey" = "8:_A5E50303EBCF4E13B1E85CD0AEDA0C31"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B4E7F878516042FF8E2767782EB8741D"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -484,4 +496,24 @@
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_16898359DEFD4ED5A9AA75F627C67BFF"
+            {
+            "SourcePath" = "8:..\\winbuild\\x64\\Release\\gfortran\\fmpich2g.lib"
+            "TargetName" = "8:fmpich2g.lib"
+            "Tag" = "8:"
+            "Folder" = "8:_21FB2EC726254C54839F05E4290C1045"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_18D946452B7F4DBB81818445A0BC79D1"
             {
@@ -1250,4 +1282,24 @@
             "Tag" = "8:"
             "Folder" = "8:_40F589E2DCCB433E88F7946F0C0C75C5"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4E7F878516042FF8E2767782EB8741D"
+            {
+            "SourcePath" = "8:..\\winbuild\\x64\\Release\\gfortran\\fmpich2g.dll"
+            "TargetName" = "8:fmpich2g.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_C25C11E398284C2EAFD99160D8C6EA71"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"