diff --git a/Configure b/Configure
index 22a5793e2..88d87a598 100755
--- a/Configure
+++ b/Configure
@@ -1717,6 +1717,10 @@ while (<IN>)
 		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/;
 		}
 	s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/;
+	if ($fipscanisteronly == 2 && exists $disabled{"ec2m"})
+		{
+		next if (/ec2_/ || /bn_gf2m/);
+		}
 	print OUT $_."\n";
 	}
 close(IN);
diff --git a/util/fipsdist.pl b/util/fipsdist.pl
index 621f90493..f660c2041 100644
--- a/util/fipsdist.pl
+++ b/util/fipsdist.pl
@@ -21,6 +21,13 @@ foreach (split / /, $ENV{LINKDIRS} ) { $cdirs{$_} = 1 };
 
 $cdirs{perlasm} = 1;
 
+if (exists $ENV{NOEC2M})
+	{
+	delete $tarobjs{"bn_gf2m.c"};
+	delete $tarobjs{"ec2_mult.c"};
+	delete $tarobjs{"ec2_smpl.c"};
+	}
+
 my %keep = 
 	(
 	"Makefile.fips" => 1,