diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 0ee775943..badc3e44a 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1365,7 +1365,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      false,
      "Variables that Control the Build");
   cm->DefineProperty
-    ("CMAKE_POSITION_INDEPENDENT_FLAGS", cmProperty::VARIABLE,
+    ("CMAKE_POSITION_INDEPENDENT_CODE", cmProperty::VARIABLE,
      "Default value for POSITION_INDEPENDENT_CODE of targets.",
      "This variable is used to initialize the "
      "POSITION_INDEPENDENT_CODE property on all the targets. "
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 48811c82c..65b586da6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -761,7 +761,10 @@ void cmTarget::DefineProperties(cmake *cm)
      "The POSITION_INDEPENDENT_CODE property determines whether position "
      "independent executables or shared libraries will be created.  "
      "This property is true by default for SHARED and MODULE library "
-     "targets and false otherwise.");
+     "targets and false otherwise.  "
+     "This property is initialized by the value of the variable "
+     "CMAKE_POSITION_INDEPENDENT_CODE if it is set when a target is"
+     "created.");
 
   cm->DefineProperty
     ("POST_INSTALL_SCRIPT", cmProperty::TARGET,