1 files changed, 9 insertions, 2 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 2785e325bf..e445135768 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1476,9 +1476,16 @@ use File::Glob qw(:case);
     },
 );
 
+
 # legacy CPAN flag
-for ( values %Modules ) {
-    $_->{CPAN} = !!$_->{DISTRIBUTION};
+for my $mod_name ( keys %Modules ) {
+    my $data = $Modules{$mod_name};
+    $data->{CPAN} = !!$data->{DISTRIBUTION};
+    my (@files)= split /\s+/, $data->{FILES};
+    if (@files and $files[0]=~s!^(cpan|dist)/!!) {
+        $DistName{$files[0]} = $mod_name;
+        $DistName{"$1/$files[0]"} = $mod_name;
+    }
 }
 
 # legacy UPSTREAM flag