diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 2f81f097c..6b019e97c 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1576,6 +1576,21 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     debugStr = "NO";
     }    
+
+  // Convert "XCODE_ATTRIBUTE_*" properties directly.
+  {
+  cmPropertyMap const& props = target.GetProperties();
+  for(cmPropertyMap::const_iterator i = props.begin();
+      i != props.end(); ++i)
+    {
+    if(i->first.find("XCODE_ATTRIBUTE_") == 0)
+      {
+      buildSettings->AddAttribute(i->first.substr(16).c_str(),
+                                  this->CreateString(i->second.GetValue()));
+      }
+    }
+  }
+
   buildSettings->AddAttribute("GCC_GENERATE_DEBUGGING_SYMBOLS",
                               this->CreateString(debugStr));
   buildSettings->AddAttribute("GCC_OPTIMIZATION_LEVEL", 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1f3250b10..0a2cda4bf 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -276,6 +276,12 @@ void cmTarget::DefineProperties(cmake *cm)
      "exported symbols and then used for linking.  "
      "All Windows-based systems including Cygwin are DLL platforms.");
 
+  cm->DefineProperty
+    ("XCODE_ATTRIBUTE_<an-attribute>", cmProperty::TARGET,
+     "Set Xcode target attributes directly.",
+     "Tell the Xcode generator to set '<an-attribute>' to a given value "
+     "in the generated Xcode project.  Ignored on other generators.");
+
   cm->DefineProperty
     ("GENERATOR_FILE_NAME", cmProperty::TARGET,
      "Generator's file for this target.",