diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 1df573ed6..9a81138c3 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1366,24 +1366,28 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
       if(soName != realName)
         {
         std::string fname = cmSystemTools::GetFilenameName(realName);
-        if(cmSystemTools::FileExists(soName.c_str()))
+        if(cmSystemTools::FileExists(soName.c_str()) ||
+           cmSystemTools::FileIsSymlink(soName.c_str()))
           {
           cmSystemTools::RemoveFile(soName.c_str());
           }
         if(!cmSystemTools::CreateSymlink(fname.c_str(), soName.c_str()))
           {
+          cmSystemTools::ReportLastSystemError("cmake_symlink_library");
           result = 1;
           }
         }
       if(name != soName)
         {
         std::string fname = cmSystemTools::GetFilenameName(soName);
-        if(cmSystemTools::FileExists(soName.c_str()))
+        if(cmSystemTools::FileExists(name.c_str()) ||
+           cmSystemTools::FileIsSymlink(name.c_str()))
           {
           cmSystemTools::RemoveFile(name.c_str());
           }
         if(!cmSystemTools::CreateSymlink(fname.c_str(), name.c_str()))
           {
+          cmSystemTools::ReportLastSystemError("cmake_symlink_library");
           result = 1;
           }
         }
@@ -1398,12 +1402,14 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
       if(name != realName)
         {
         std::string fname = cmSystemTools::GetFilenameName(realName);
-        if(cmSystemTools::FileExists(realName.c_str()))
+        if(cmSystemTools::FileExists(name.c_str()) ||
+           cmSystemTools::FileIsSymlink(name.c_str()))
           {
           cmSystemTools::RemoveFile(name.c_str());
           }
         if(!cmSystemTools::CreateSymlink(fname.c_str(), name.c_str()))
           {
+          cmSystemTools::ReportLastSystemError("cmake_symlink_executable");
           result = 1;
           }
         }