diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 068b70491637cea31e6b1b8a89496c671c83ec15..7ace933a6b9fae21d1c6725b0f419c370a1e1f80 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -25,11 +25,16 @@ my $fips_sha1_exe_path = "";
 
 local $fipscanisterbuild = 0;
 
+my $fipscanisteronly = 0;
+
 my $fipslibdir = "";
 my $baseaddr = "";
 
 my $ex_l_libs = "";
 
+my $build_targets = "lib exe";
+my $libs_dep = "\$(O_CRYPTO) \$(O_SSL)";
+
 # Options to import from top level Makefile
 
 my %mf_import = (
@@ -371,7 +376,7 @@ for (;;)
 	if ($key eq "LIBKRB5")
 		{ $ex_libs .= " $val" if $val ne "";}
 
-	if ($key eq "TEST")
+	if ($key eq "TEST" && (!$fipscanisteronly || $dir =~ /^fips/ ))
 		{ $test.=&var_add($dir,$val, 0); }
 
 	if (($key eq "PROGS") || ($key eq "E_OBJ"))
@@ -448,7 +453,7 @@ if ($fips)
 				$lib_obj{"FIPS"} .= "$_ ";
 				}
 			}
-		else
+		elsif (!$fipscanisteronly)
 			{
 			$lib_obj{"CRYPTO"} .= "$_ ";
 			}
@@ -498,7 +503,7 @@ if ($fips)
 	{
 	if (!$shlib)
 		{
-		$ex_build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)";
+		$build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)";
 		$ex_l_libs .= " \$(O_FIPSCANISTER)";
 		$ex_libs_dep .= " \$(O_FIPSCANISTER)" if $fipscanisterbuild;
 		}
@@ -521,6 +526,13 @@ if ($fips)
 		}
 	}
 
+if ($fipscanisteronly)
+	{
+	$build_targets = "\$(O_FIPSCANISTER) \$(T_EXE)";
+	$libs_dep = "";
+	}
+	
+
 if ($shlib)
 	{
 	$extra_install= <<"EOF";
@@ -659,13 +671,13 @@ INC=-I\$(INC_D) -I\$(INCL_D)
 APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG)
 LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG)
 SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG)
-LIBS_DEP=\$(O_CRYPTO) \$(O_SSL) $ex_libs_dep
+LIBS_DEP=$libs_dep
 
 #############################################
 EOF
 
 $rules=<<"EOF";
-all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers \$(FIPS_SHA1_EXE) lib exe $ex_build_targets
+all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers \$(FIPS_SHA1_EXE) $build_targets
 
 banner:
 $banner
@@ -1325,6 +1337,7 @@ sub read_options
 		"no-zlib-dynamic" => 0,
 		"fips" => \$fips,
 		"fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
+		"fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
 		);
 
 	if (exists $valid_options{$_})