diff --git a/CHANGES.rst b/CHANGES.rst
index 3a43cc423d2ec82b84b050fc78fed05a02dfb923..308523c37b27c218c60f2d6d8a44970768ded749 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -27,6 +27,7 @@ Tools
   * support different generations of launch logic
   * support stand-alone atmosphere scripts
   * add option to set path to helper script
+  * improve file section labels
 * setconfig: make output more similar to mkexp conventions
   * remove quotes from section names (may be disabled)
   * fix spaces before inline comments when no value is given
diff --git a/files2config b/files2config
index 1903ba6394269dde401e4c0470f325f7f40d7688..129ad615070d550f9834e9309c03e24762b64948 100755
--- a/files2config
+++ b/files2config
@@ -98,7 +98,6 @@ sub subst_value($) {
 }
 
 unless($direct) {
-    my $i = 0;
     print("[files]\n");
     my $last_mtd = '';
     my $last_dir = '';
@@ -106,7 +105,7 @@ unless($direct) {
         my ($mtd, $dir, $src, $dst) = @{$file_info{$key}};
         if($last_dir ne $dir || $last_mtd ne $mtd) {
             my $subst_dir = subst_value($dir);
-            printf("  [[section_%02d]]\n", ++$i);
+            print("  [[$subst_dir $mtd]]\n");
             print("    .base_dir = $subst_dir\n");
             print("    .method = $mtd\n");
         }