diff -r -u cmake-2.8.5.orig/Source/cmExtraCodeBlocksGenerator.cxx cmake-2.8.5.new/Source/cmExtraCodeBlocksGenerator.cxx
--- cmake-2.8.5.orig/Source/cmExtraCodeBlocksGenerator.cxx	2011-07-08 08:12:56 +0200
+++ cmake-2.8.5.new/Source/cmExtraCodeBlocksGenerator.cxx	2011-09-21 15:49:50 +0200
@@ -503,12 +503,16 @@
 
   // insert all source files in the CodeBlocks project
   // first the C/C++ implementation files, then all others
+  std::vector<cmSourceGroup> sourceGroups = mf->GetSourceGroups();
   for (std::map<std::string, cmSourceFile*>::const_iterator
        sit=cFiles.begin();
        sit!=cFiles.end();
        ++sit)
     {
+    std::string const& source = sit->second->GetFullPath();
+    cmSourceGroup& sourceGroup = mf->FindSourceGroup(source.c_str(), sourceGroups);
     fout<<"      <Unit filename=\""<< sit->first <<"\">\n"
+        <<"        <Option virtualFolder=\""<< std::string(sourceGroup.GetName()) <<"\" />\n"
           "      </Unit>\n";
     }
   for (std::set<std::string>::const_iterator
@@ -516,7 +520,10 @@
        sit!=otherFiles.end();
        ++sit)
     {
+    std::string const& source = *sit;
+    cmSourceGroup& sourceGroup = mf->FindSourceGroup(source.c_str(), sourceGroups);
     fout<<"      <Unit filename=\""<< sit->c_str() <<"\">\n"
+        <<"        <Option virtualFolder=\""<< std::string(sourceGroup.GetName()) <<"\" />\n"
           "      </Unit>\n";
     }