diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 9829d19..57ea21b 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -183,6 +183,7 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os,
   std::string buildstr = build.str();
   const std::string assignments = variable_assignments.str();
   const std::string args = arguments.str();
+  // FIXME: ck why not always?
   if (cmdLineLimit > 0
       && args.size() + buildstr.size() + assignments.size()
          > (size_t) cmdLineLimit)
@@ -307,7 +308,7 @@ void cmGlobalNinjaGenerator::WriteRule(std::ostream& os,
       cmGlobalNinjaGenerator::Indent(os, 1);
       os << "rspfile = " << rspfile << "\n";
       cmGlobalNinjaGenerator::Indent(os, 1);
-      os << "rspfile_content = $in" << "\n";
+      os << "rspfile_content = $in $LINK_LIBRARIES" << "\n";    // NOTE: add LINK_LIBRARIES too if not used! ck
     }
 
   if(restat)
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 1129948..f715037 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -112,10 +112,8 @@ void cmNinjaNormalTargetGenerator::Generate()
     }
   else
     {
-    this->WriteLinkRule(false);
-#ifdef _WIN32 // TODO response file support only Linux
-    this->WriteLinkRule(true);
-#endif
+    this->WriteLinkRule(false); // write rule with rspfile
+    this->WriteLinkRule(true);  // 2. time without rspfile?
     this->WriteLinkStatement();
     }
 }
@@ -226,7 +224,13 @@ cmNinjaNormalTargetGenerator
     vars.TargetVersionMajor = targetVersionMajor.c_str();
     vars.TargetVersionMinor = targetVersionMinor.c_str();
 
-    vars.LinkLibraries = "$LINK_LIBRARIES";
+    if (!useResponseFile)
+      {
+      vars.LinkLibraries = "$LINK_LIBRARIES";
+      } else
+      {
+      vars.LinkLibraries = ""; // NOTE: depends on response file usage! ck
+      }
     vars.Flags = "$FLAGS";
     vars.LinkFlags = "$LINK_FLAGS";