diff --git a/Makefile.in b/Makefile.in
index 355cc9ba1..df6740300 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -341,8 +341,9 @@ TAGS:	$(TAGFILES)
 # Test targets
 
 dist-file-list:
-	@echo "dist-file-list:";  # Scripts look for this
+	@echo "begin-dist-file-list:";  # Scripts look for this
 	@echo $(wildcard $(DISTFILES))
+	@echo "end-dist-file-list:";  # Scripts look for this
 
 ######################################################################
 # Distributions
diff --git a/test_regress/t/t_dist_manifest.pl b/test_regress/t/t_dist_manifest.pl
index e5897b9f0..ec8af52dc 100755
--- a/test_regress/t/t_dist_manifest.pl
+++ b/test_regress/t/t_dist_manifest.pl
@@ -10,11 +10,12 @@ if (!$::Driver) { use FindBin; exec("./driver.pl", @ARGV, $0); die; }
 my $root = "..";
 my $Debug;
 
-###
-# Call once and ignore to rebuild any targets before we need the output
+### Must trim output before and after our file list
 `cd $root && make dist-file-list`;
 my $manifest_files = `cd $root && make dist-file-list`;
-$manifest_files =~ s!.*dist-file-list:!!sg;
+$manifest_files =~ s!.*begin-dist-file-list:!!sg;
+$manifest_files =~ s!end-dist-file-list:.*$!!sg;
+print "MF $manifest_files\n";
 my %files;
 foreach my $file (split /\s+/,$manifest_files) {
     next if $file eq '';