diff --git a/Source/cmBorlandMakefileGenerator.cxx b/Source/cmBorlandMakefileGenerator.cxx
index f8f0a9a8e..01fae24a3 100644
--- a/Source/cmBorlandMakefileGenerator.cxx
+++ b/Source/cmBorlandMakefileGenerator.cxx
@@ -303,7 +303,7 @@ void cmBorlandMakefileGenerator::OutputStaticLibraryRule(std::ostream& fout,
   deleteCommand += target;
 
   command += " $(";
-  command += std::string(name) + "_SRC_OBJS)";
+  command += std::string(name) + "_SRC_OBJS_QUOTED)";
   command += "\n|\n";
   std::string comment = "rule to build static library: ";
   comment += name;
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx
index 9e78f77ca..f3b04871e 100644
--- a/Source/cmUnixMakefileGenerator.cxx
+++ b/Source/cmUnixMakefileGenerator.cxx
@@ -378,6 +378,21 @@ void cmUnixMakefileGenerator::OutputTargetRules(std::ostream& fout)
               }
 	  }
 	fout << "\n\n";
+	fout << l->first << "_SRC_OBJS_QUOTED = ";
+	for(std::vector<cmSourceFile>::iterator i = classes.begin(); 
+	    i != classes.end(); i++)
+	  {
+	    if(!i->IsAHeaderFileOnly())
+	      {
+              std::string outExt(this->GetOutputExtension(i->GetSourceExtension().c_str()));
+              if(outExt.size())
+                {
+                fout << "\\\n\"" << this->ConvertToNativePath(i->GetSourceName().c_str())
+                     << outExt.c_str() << "\" ";
+                }
+              }
+	  }
+	fout << "\n\n";
       }
     }
   fout << "CLEAN_OBJECT_FILES = ";