diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 2d77a82b0c8194eab9d29a3efdc5376e8b7c2661..66b78f417dd72d5355fc16de33e541893b96da34 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -84,7 +84,10 @@ my @dirs = (
 
 %top;
 
+my $fipscanisteronly = 0;
+
 foreach (@dirs) {
+	next if ($fipscanisteronly && !(-d $_));
 	&files_dir ($_, "Makefile");
 }
 
@@ -150,4 +153,8 @@ if ($dir eq "." && defined($sym{"BUILDENV"}))
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);
+if ($dir eq "." && $sym{CONFIGURE_ARGS} =~ /fipscanisteronly/)
+	{
+	$fipscanisteronly = 1;
+	}
 }