diff --git a/core/tools/check_extensions.pl b/core/tools/check_extensions.pl
index 152e84e7ea..932e147d08 100755
--- a/core/tools/check_extensions.pl
+++ b/core/tools/check_extensions.pl
@@ -63,10 +63,13 @@ END
     close $man;
 }
 
+#my $dir = cwd();
+
 foreach my $ext ( sort @extensions ) {
     chomp $ext;
+    chdir "$root/$ext";
     my @itemlist;
-    my $gitlog = `git log --oneline $start..HEAD $ext`;
+    my $gitlog = `git log --oneline $start..HEAD .`;
     next
       unless
       $gitlog;    # Comment this to get verbose report of unmodified extensions.
@@ -95,10 +98,16 @@ END
     my $class = ( $ext =~ m/Plugin/ ) ? 'Plugins' : 'Contrib';
     my $origsrc = `git show $start:$ext/lib/Foswiki/$class/$ext.pm`;
 
-    my $ov = extractModuleVersion( "$ext/lib/Foswiki/$class/$ext", $origsrc );
-    my $lv = extractModuleVersion("$ext/lib/Foswiki/$class/$ext");
+    my $mancheck = `../core/tools/check_manifest.pl`;
+    chomp $mancheck;
+    $mancheck =~ s/^Processing manifest .*\/MANIFEST$//g;
+    print "\n\n$mancheck" if ($mancheck);
+
+    my $ov      = extractModuleVersion( "lib/Foswiki/$class/$ext", $origsrc );
+    my $lv      = extractModuleVersion("lib/Foswiki/$class/$ext");
     my $exthash = get_ext_info($ext);
 
+    print "\n\n";
     print
       "$ext - Last release: $ov, Uploaded $exthash->{version}, Module: $lv\n";
 
@@ -216,7 +225,7 @@ sub extractModuleVersion {
 
 sub get_ext_topic {
     my $ext  = shift;
-    my $file = "$ext/data/System/$ext.txt";
+    my $file = "data/System/$ext.txt";
 
     open( my $mf, '<', "$file" ) or die "Unable to open $file";
     local $/;