Source/cmTarget.cxx                        | 10 ++++++++--
 Source/cmVisualStudio10TargetGenerator.cxx | 11 +++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ac655da..a2adc03 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1401,8 +1401,12 @@ void cmTarget::DefineProperties(cmake *cm)
   cm->DefineProperty
     ("VS_KEYWORD", cmProperty::TARGET,
      "Visual Studio project keyword.",
-     "Can be set to change the visual studio keyword, for example "
-     "Qt integration works better if this is set to Qt4VSv1.0. ");
+	 "Change the \"keyword\" attribute for a generated Visual Studio project."
+	 "The default value is \"Win32Proj\.\n"
+	 "examples:\n"
+	 "- Qt integration works better if this is set to Qt4VSv1.0.\n"
+	 "- Fortran targets when generating the .vfproj files for the Intel Fortran VS plugin."
+	 "- Or \"ManagedCProj\", for example, in a Visual Studio managed C++ unit test project.");
   cm->DefineProperty
     ("VS_SCC_PROVIDER", cmProperty::TARGET,
      "Visual Studio Source Code Control Provider.",
@@ -1436,6 +1440,8 @@ void cmTarget::DefineProperties(cmake *cm)
   cm->DefineProperty
     ("VS_GLOBAL_KEYWORD", cmProperty::TARGET,
      "Visual Studio project keyword.",
+	 "This target property is obsolete. Use property VS_KEYWORD instead."
+	 "\n"
      "Sets the \"keyword\" attribute for a generated Visual Studio "
      "project. Defaults to \"Win32Proj\". You may wish to override "
      "this value with \"ManagedCProj\", for example, in a Visual "
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a26b291..d03236e 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -265,16 +265,19 @@ void cmVisualStudio10TargetGenerator::Generate()
       }
     }
 
-  const char* vsGlobalKeyword =
-    this->Target->GetProperty("VS_GLOBAL_KEYWORD");
-  if(!vsGlobalKeyword)
+  // NOTE: This property (VS_GLOBAL_KEYWORD) is obsolete
+  // If VS_GLOBAL_KEYWORD is set then use the value for VS_KEYWORD
+  // Remove this later when VS_GLOBAL_KEYWORD is removed.
+  const char* vsGlobalKeyword = this->Target->GetProperty("VS_GLOBAL_KEYWORD");
+  const char* vsKeyword = vsGlobalKeyword ? vsGlobalKeyword : this->Target->GetProperty("VS_KEYWORD");
+  if(!vsKeyword)
     {
     this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
     }
   else
     {
     this->WriteString("<Keyword>", 2);
-    (*this->BuildFileStream) << cmVS10EscapeXML(vsGlobalKeyword) <<
+    (*this->BuildFileStream) << cmVS10EscapeXML(vsKeyword) <<
       "</Keyword>\n";
     }