diff --git a/Makefile.fips b/Makefile.fips
index 929fa95c502bf2c43f4e739742f41c754c92008f..f5a95a4c8362290d20b0d69313384e3f1184a05d 100644
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -2,7 +2,7 @@
 ## Makefile for OpenSSL: fipscanister.o only
 ##
 
-VERSION=
+VERSION=fips-2.0-test
 MAJOR=
 MINOR=
 SHLIB_VERSION_NUMBER=
@@ -180,7 +180,7 @@ SHARED_LDFLAGS=
 GENERAL=        Makefile
 BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
-TARFILE=        $(NAME).tar
+TARFILE=        openssl-fips-test-2.0.tar
 WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os2.h
 HEADER=         e_os.h
@@ -600,7 +600,7 @@ tar:
 	find . -type d -print | xargs chmod 755
 	find . -type f -print | xargs chmod a+r
 	find . -type f -perm -0100 -print | xargs chmod a+x
-	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
+	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | $(BUILDENV) $(PERL) util/fipsdist.pl | sort > ../$(TARFILE).list; \
 	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
 	tardy --user_number=0  --user_name=openssl \
 	      --group_number=0 --group_name=openssl \
@@ -618,7 +618,7 @@ tar-snap:
 	ls -l ../$(TARFILE)
 
 dist:   
-	$(PERL) Configure dist
+	$(PERL) Configure dist fipscanisteronly
 	@$(MAKE) dist_pem_h
 	@$(MAKE) SDIRS='$(SDIRS)' clean
 	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar
diff --git a/test/Makefile b/test/Makefile
index 899caee767e2e96b2730d4e7149f58b13571441a..2f298ef6fb567ef13c408a4171b96bccdef69741 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -361,7 +361,7 @@ dclean:
 			testreq.pem
 
 clean:
-	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest
+	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) $(FIPSEXE) *.ss *.srl log dummytest
 
 $(DLIBSSL):
 	(cd ..; $(MAKE) DIRS=ssl all)
diff --git a/util/fipsobj.pl b/util/fipsobj.pl
index 09fe34a244fcee5eb8507a193b2e984e54f0fc71..bcc2a58b01f0e186e50b92dbea8203132cb8f145 100644
--- a/util/fipsobj.pl
+++ b/util/fipsobj.pl
@@ -6,7 +6,7 @@ my $dir = $ARGV[0];
 
 my $asmobjs = "";
 
-# Add any needed assembly languagr files.
+# Add any needed assembly language files.
 
 $asmobjs = $ENV{AES_ENC} if $dir eq "aes";
 $asmobjs = $ENV{BN_ASM} if $dir eq "bn";