diff -uar cmake/Source/cmake.cxx cmake-merge/Source/cmake.cxx
--- cmake/Source/cmake.cxx	2012-12-12 17:44:55.154342400 -0600
+++ cmake-merge/Source/cmake.cxx	2012-12-12 19:27:43.796549000 -0600
@@ -3534,6 +3534,13 @@
      "RUN_TESTS will be organized into this FOLDER. See also the "
      "documentation for the FOLDER target property.");
 
+  cm->DefineProperty
+    ("AUTOMOC_FOLDER", cmProperty::GLOBAL,
+     "Name of FOLDER for *_automoc targets that are added automatically by CMake.",
+     "If not set, CMake uses the FOLDER property of the parent target as a "
+     "default value for this property. See also the documentation for the "
+     "FOLDER target property and the AUTOMOC target property.");
+
   // ================================================================
   // define variables as well
   // ================================================================
diff -uar cmake/Source/cmQtAutomoc.cxx cmake-merge/Source/cmQtAutomoc.cxx
--- cmake/Source/cmQtAutomoc.cxx	2012-12-12 17:44:56.059144000 -0600
+++ cmake-merge/Source/cmQtAutomoc.cxx	2012-12-12 18:40:59.114468300 -0600
@@ -168,8 +168,17 @@
                               automocTargetName.c_str(), true,
                               workingDirectory.c_str(), depends,
                               commandLines, false, automocComment.c_str());
-  // inherit FOLDER property from target (#13688)
-  copyTargetProperty(automocTarget, target, "FOLDER");
+  // Set target folder
+  const char* automocFolder = makefile->GetCMakeInstance()->GetProperty("AUTOMOC_FOLDER");
+  if (automocFolder)
+    {
+    automocTarget->SetProperty("FOLDER", automocFolder);
+    }
+  else
+    {
+    // inherit FOLDER property from target (#13688)
+    copyTargetProperty(automocTarget, target, "FOLDER");
+    }
 
   target->AddUtility(automocTargetName.c_str());