diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index fd3508e..f4b6d67 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1472,6 +1472,13 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
         {
         linkFlags += targetLinkFlags;
         linkFlags += " ";
+        std::string staticLibFlagsConfig = "STATIC_LIBRARY_FLAGS_" + buildType;
+        targetLinkFlags = target.GetProperty(staticLibFlagsConfig.c_str());
+        if(targetLinkFlags)
+          {
+          linkFlags += targetLinkFlags;
+          linkFlags += " ";
+          }
         }
       }
       break; 
@@ -1512,8 +1519,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
         {
         linkFlags += targetLinkFlags;
         linkFlags += " ";
-        std::string configLinkFlags = targetLinkFlags;
-        configLinkFlags += buildType;
+        std::string configLinkFlags = "LINK_FLAGS_" + buildType;
         targetLinkFlags = target.GetProperty(configLinkFlags.c_str());
         if(targetLinkFlags)
           { 
@@ -1584,8 +1590,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
         {
         linkFlags += targetLinkFlags;
         linkFlags += " ";  
-        std::string configLinkFlags = targetLinkFlags;
-        configLinkFlags += buildType;
+        std::string configLinkFlags = "LINK_FLAGS_" + buildType;
         targetLinkFlags = target.GetProperty(configLinkFlags.c_str());
         if(targetLinkFlags)
           { 
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 2d8197c..8c78193 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -915,9 +915,23 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(const char* libflags = target.GetProperty("STATIC_LIBRARY_FLAGS"))
+    std::string extraStaticLibOptions;
+    const char* libflags = target.GetProperty("STATIC_LIBRARY_FLAGS");
+    if(libflags)
       {
-      fout << "\t\t\t\tAdditionalOptions=\"" << libflags << "\"\n";
+      extraStaticLibOptions = libflags;
+      }
+    std::string staticLibFlagsConfig = "STATIC_LIBRARY_FLAGS_";
+    staticLibFlagsConfig += configTypeUpper;
+    libflags = target.GetProperty(staticLibFlagsConfig.c_str());
+    if(libflags)
+      {
+      extraStaticLibOptions += " ";
+      extraStaticLibOptions += libflags;
+      }
+    if(!extraStaticLibOptions.empty())
+      {
+      fout << "\t\t\t\tAdditionalOptions=\"" << extraStaticLibOptions << "\"\n";
       }
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(libpath.c_str()) << "\"/>\n";
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index d3e6e11..8c0dd27 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -122,6 +122,10 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules()
   std::string extraFlags;
   this->LocalGenerator->AppendFlags
     (extraFlags,this->Target->GetProperty("STATIC_LIBRARY_FLAGS"));
+  std::string staticLibFlagsConfig = "STATIC_LIBRARY_FLAGS_";
+  staticLibFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
+  this->LocalGenerator->AppendFlags
+    (extraFlags, this->Target->GetProperty(staticLibFlagsConfig.c_str()));
   this->WriteLibraryRules(linkRuleVar.c_str(), extraFlags.c_str(), false);
 }
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 54b1815..b81f194 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -705,7 +705,15 @@ void cmTarget::DefineProperties(cmake *cm)
   cm->DefineProperty
     ("STATIC_LIBRARY_FLAGS", cmProperty::TARGET,
      "Extra flags to use when linking static libraries.",
-     "Extra flags to use when linking a static library.");
+     "The STATIC_LIBRARY_FLAGS property can be used to add extra flags to "
+     "use when linking a static library. STATIC_LIBRARY_FLAGS_<CONFIG> "
+     "will add to the configuration <CONFIG>, "
+     "for example, DEBUG, RELEASE, MINSIZEREL, RELWITHDEBINFO. ");
+
+  cm->DefineProperty
+    ("STATIC_LIBRARY_FLAGS_<CONFIG>", cmProperty::TARGET,
+     "Per-configuration flags for using when linking a static library.",
+     "This is the configuration-specific version of STATIC_LIBRARY_FLAGS.");
 
   cm->DefineProperty
     ("SUFFIX", cmProperty::TARGET,