diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 6866427d1..908fd4764 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -4,7 +4,6 @@
 \.svn/
 \.(bak|old)/
 \.(bak|old)$
-\bMakefile$
 \.tar\.
 .*\.tgz
 .*\.log
@@ -19,11 +18,16 @@
 /INCA_libs/
 /cov_work/
 /logs/
-Makefile
-src/Makefile_obj
-include/verilated.mk
-config.cache
-config.status
+^Makefile$
+src/Makefile$
+src/Makefile_obj$
+include/verilated.mk$
+config.cache$
+config.status$
 verilator_bin.*
+.vcsmx_rebuild$
 autom4te\.cache/
 nodist/
+/simv$
+/simv.daidir/
+/csrc/
diff --git a/nodist/invoke_vcs b/nodist/invoke_vcs
new file mode 100755
index 000000000..f4df131b7
--- /dev/null
+++ b/nodist/invoke_vcs
@@ -0,0 +1,59 @@
+#!/usr/bin/perl -w
+# See copyright, etc in below POD section.
+######################################################################
+
+require 5.006_001;
+use strict;
+
+#======================================================================
+# main
+
+delete $ENV{MODULE_VERSION};
+_setup_modules();
+module('add','synopsys-vcs');
+exec('vcs',@ARGV);
+
+#######################################################################
+# Modules package
+
+sub _setup_modules {
+    # Load the 'module' command into the environment
+    my $init = "$ENV{MODULESHOME}/init/perl";
+    (-f $init) or die "%Error: Script not found: $init,";
+    require $init;
+}
+
+#######################################################################
+__END__
+
+=pod
+
+=head1 NAME
+
+invoke_vcs - Invoke tool under "modules" command
+
+=head1 SYNOPSIS
+
+  invoke_vcs  {ncv arguments}
+
+=head1 DESCRIPTION
+
+=head1 DISTRIBUTION
+
+Copyright 2005-2009 by Wilson Snyder.  This package is free software; you
+can redistribute it and/or modify it under the terms of either the GNU
+Lesser General Public License Version 3 or the Perl Artistic License
+Version 2.0.
+
+=head1 AUTHORS
+
+Wilson Snyder <wsnyder@wsnyder.org>
+
+=head1 SEE ALSO
+
+=cut
+
+######################################################################
+### Local Variables:
+### compile-command: "./invoke_vcs -help"
+### End:
diff --git a/test_regress/t/t_dist_manifest.pl b/test_regress/t/t_dist_manifest.pl
index 2968a5836..a38dfaf15 100755
--- a/test_regress/t/t_dist_manifest.pl
+++ b/test_regress/t/t_dist_manifest.pl
@@ -29,11 +29,13 @@ foreach my $file (split /\s+/,$all_files) {
     $files{$file} |= 2;
 }
 
+my %file_regexps;
 my $skip = file_contents("$root/MANIFEST.SKIP");
 foreach my $file (sort keys %files) {
     foreach my $skip (split /\s+/,$skip) {
 	if ($file =~ /$skip/) {
 	    $files{$file} |= 4;
+	    $file_regexps{$file} = $skip;
 	}
     }
 }
@@ -53,6 +55,8 @@ foreach my $file (sort keys %files) {
 	$warns{$file} = "File not in manifest or MANIFEST.SKIP: $file";
     } elsif (!$dir && $tar && !$skip) {
 	$warns{$file} = "File in manifest, but not directory: $file";
+    } elsif ($dir && $tar && $skip) {
+	$warns{$file} = "File in manifest and also MANIFEST.SKIP, too general skip regexp '$file_regexps{$file}'?: $file";
     }
 }