diff --git a/Source/CMakeSetup.dsw b/Source/CMakeSetup.dsw
index d734315a6..50f6e6238 100644
--- a/Source/CMakeSetup.dsw
+++ b/Source/CMakeSetup.dsw
@@ -24,16 +24,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name CMakeSetupCMD
+    Project_Dep_Name CMakeLib
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name CMakeLib
+    Project_Dep_Name cmake
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "CMakeSetupCMD"=.\CMakeSetupCMD.dsp - Package Owner=<4>
+Project: "DumpDocumentation"=.\DumpDocumentation.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -48,7 +48,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "DumpDocumentation"=.\DumpDocumentation.dsp - Package Owner=<4>
+Project: "cmake"=.\cmake.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index c2de96470..9c5a0f13e 100644
--- a/Source/MFCDialog/CMakeSetupDialog.cpp
+++ b/Source/MFCDialog/CMakeSetupDialog.cpp
@@ -319,6 +319,8 @@ void CMakeSetupDialog::OnBuildProjects()
     }
   // Make sure we are working from the cache on disk
   this->LoadCacheFromDiskToGUI();
+
+// duh
   // Create a makefile object
   cmMakefile makefile;
   makefile.SetMakefileGenerator(new cmMSProjectGenerator);
@@ -343,6 +345,8 @@ void CMakeSetupDialog::OnBuildProjects()
   makefile.GenerateMakefile();
   // Save the cache
   cmCacheManager::GetInstance()->SaveCache(&makefile);
+// end duh
+  
   // update the GUI with any new values in the caused by the
   // generation process
   this->LoadCacheFromDiskToGUI();
@@ -471,7 +475,7 @@ void CMakeSetupDialog::LoadCacheFromDiskToGUI()
       ("CMAKE_ROOT", root.c_str(),
        "Path to CMake installation.", cmCacheManager::INTERNAL);
     std::string cMakeCMD = "\""+cmSystemTools::GetProgramPath(fname);
-    cMakeCMD += "/CMakeSetupCMD.exe\"";
+    cMakeCMD += "/cmake.exe\"";
     
     // Save the value in the cache
     cmCacheManager::GetInstance()->AddCacheEntry("CMAKE_COMMAND",
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index d9a5c24f1..56efc38bd 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -46,6 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "cmMSProjectGenerator.h"
 #else
 #include "cmUnixMakefileGenerator.h"
+#endif
+
 int main(int ac, char** av)
 {
   cmake foo;
@@ -56,7 +58,6 @@ int main(int ac, char** av)
     }
   return foo.Generate(ac,av);
 }
-#endif
 
 void cmake::Usage(const char* program)
 {