diff --git a/Makefile.org b/Makefile.org
index 1b96b76440..35457014e7 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -180,7 +180,7 @@ LIBZLIB=
 # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
 SHLIB_MARK=
 
-DIRS=   crypto fips ssl $(SHLIB_MARK) apps test tools
+DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools
 SHLIBDIRS= crypto ssl
 
 # dirs in crypto to build
diff --git a/apps/Makefile b/apps/Makefile
index 1b65e2a13e..4daa92382f 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -145,7 +145,7 @@ $(DLIBCRYPTO):
 $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
 	$(RM) $(EXE)
 	@if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
-	  FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
+	  FIPSLD_CC=$(CC); CC=$(TOP)/fips-1.0/fipsld; export CC FIPSLD_CC; \
 	fi; \
 	SHARED_LIBS="$(SHARED_LIBS)"; \
 	if [ "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \
diff --git a/fips/.cvsignore b/fips-1.0/.cvsignore
similarity index 100%
rename from fips/.cvsignore
rename to fips-1.0/.cvsignore
diff --git a/fips/Makefile b/fips-1.0/Makefile
similarity index 99%
rename from fips/Makefile
rename to fips-1.0/Makefile
index 9b88ef5c6c..c6249c13f0 100644
--- a/fips/Makefile
+++ b/fips-1.0/Makefile
@@ -133,7 +133,7 @@ lib:	fipscanister.o
 
 shared:	fips_premain_dso$(EXE_EXT)
 	if [ -n "$(SHARED_LIBS)" ]; then \
-		(cd ..; $(MAKE) FIPSLD_CC=$(CC) FIPSLD=fips/fipsld $(SHARED_LIB)); \
+		(cd ..; $(MAKE) FIPSLD_CC=$(CC) FIPSLD=fips-1.0/fipsld $(SHARED_LIB)); \
 	fi
 
 libs:
diff --git a/fips/aes/.cvsignore b/fips-1.0/aes/.cvsignore
similarity index 100%
rename from fips/aes/.cvsignore
rename to fips-1.0/aes/.cvsignore
diff --git a/fips/aes/Makefile b/fips-1.0/aes/Makefile
similarity index 100%
rename from fips/aes/Makefile
rename to fips-1.0/aes/Makefile
diff --git a/fips/aes/asm/fips-ax86-elf.s b/fips-1.0/aes/asm/fips-ax86-elf.s
similarity index 100%
rename from fips/aes/asm/fips-ax86-elf.s
rename to fips-1.0/aes/asm/fips-ax86-elf.s
diff --git a/fips/aes/fips_aes_core.c b/fips-1.0/aes/fips_aes_core.c
similarity index 100%
rename from fips/aes/fips_aes_core.c
rename to fips-1.0/aes/fips_aes_core.c
diff --git a/fips/aes/fips_aes_locl.h b/fips-1.0/aes/fips_aes_locl.h
similarity index 100%
rename from fips/aes/fips_aes_locl.h
rename to fips-1.0/aes/fips_aes_locl.h
diff --git a/fips/aes/fips_aes_selftest.c b/fips-1.0/aes/fips_aes_selftest.c
similarity index 100%
rename from fips/aes/fips_aes_selftest.c
rename to fips-1.0/aes/fips_aes_selftest.c
diff --git a/fips/aes/fips_aesavs.c b/fips-1.0/aes/fips_aesavs.c
similarity index 100%
rename from fips/aes/fips_aesavs.c
rename to fips-1.0/aes/fips_aesavs.c
diff --git a/fips/des/.cvsignore b/fips-1.0/des/.cvsignore
similarity index 100%
rename from fips/des/.cvsignore
rename to fips-1.0/des/.cvsignore
diff --git a/fips/des/Makefile b/fips-1.0/des/Makefile
similarity index 100%
rename from fips/des/Makefile
rename to fips-1.0/des/Makefile
diff --git a/fips/des/asm/fips-dx86-elf.s b/fips-1.0/des/asm/fips-dx86-elf.s
similarity index 100%
rename from fips/des/asm/fips-dx86-elf.s
rename to fips-1.0/des/asm/fips-dx86-elf.s
diff --git a/fips/des/fips_des_enc.c b/fips-1.0/des/fips_des_enc.c
similarity index 100%
rename from fips/des/fips_des_enc.c
rename to fips-1.0/des/fips_des_enc.c
diff --git a/fips/des/fips_des_locl.h b/fips-1.0/des/fips_des_locl.h
similarity index 100%
rename from fips/des/fips_des_locl.h
rename to fips-1.0/des/fips_des_locl.h
diff --git a/fips/des/fips_des_selftest.c b/fips-1.0/des/fips_des_selftest.c
similarity index 100%
rename from fips/des/fips_des_selftest.c
rename to fips-1.0/des/fips_des_selftest.c
diff --git a/fips/des/fips_desmovs.c b/fips-1.0/des/fips_desmovs.c
similarity index 100%
rename from fips/des/fips_desmovs.c
rename to fips-1.0/des/fips_desmovs.c
diff --git a/fips/des/fips_set_key.c b/fips-1.0/des/fips_set_key.c
similarity index 100%
rename from fips/des/fips_set_key.c
rename to fips-1.0/des/fips_set_key.c
diff --git a/fips/dh/.cvsignore b/fips-1.0/dh/.cvsignore
similarity index 100%
rename from fips/dh/.cvsignore
rename to fips-1.0/dh/.cvsignore
diff --git a/fips/dh/Makefile b/fips-1.0/dh/Makefile
similarity index 100%
rename from fips/dh/Makefile
rename to fips-1.0/dh/Makefile
diff --git a/fips/dh/fips_dh_check.c b/fips-1.0/dh/fips_dh_check.c
similarity index 100%
rename from fips/dh/fips_dh_check.c
rename to fips-1.0/dh/fips_dh_check.c
diff --git a/fips/dh/fips_dh_gen.c b/fips-1.0/dh/fips_dh_gen.c
similarity index 100%
rename from fips/dh/fips_dh_gen.c
rename to fips-1.0/dh/fips_dh_gen.c
diff --git a/fips/dh/fips_dh_key.c b/fips-1.0/dh/fips_dh_key.c
similarity index 100%
rename from fips/dh/fips_dh_key.c
rename to fips-1.0/dh/fips_dh_key.c
diff --git a/fips/dsa/.cvsignore b/fips-1.0/dsa/.cvsignore
similarity index 100%
rename from fips/dsa/.cvsignore
rename to fips-1.0/dsa/.cvsignore
diff --git a/fips/dsa/Makefile b/fips-1.0/dsa/Makefile
similarity index 100%
rename from fips/dsa/Makefile
rename to fips-1.0/dsa/Makefile
diff --git a/fips/dsa/fips_dsa_gen.c b/fips-1.0/dsa/fips_dsa_gen.c
similarity index 100%
rename from fips/dsa/fips_dsa_gen.c
rename to fips-1.0/dsa/fips_dsa_gen.c
diff --git a/fips/dsa/fips_dsa_ossl.c b/fips-1.0/dsa/fips_dsa_ossl.c
similarity index 100%
rename from fips/dsa/fips_dsa_ossl.c
rename to fips-1.0/dsa/fips_dsa_ossl.c
diff --git a/fips/dsa/fips_dsa_selftest.c b/fips-1.0/dsa/fips_dsa_selftest.c
similarity index 100%
rename from fips/dsa/fips_dsa_selftest.c
rename to fips-1.0/dsa/fips_dsa_selftest.c
diff --git a/fips/dsa/fips_dsatest.c b/fips-1.0/dsa/fips_dsatest.c
similarity index 100%
rename from fips/dsa/fips_dsatest.c
rename to fips-1.0/dsa/fips_dsatest.c
diff --git a/fips/dsa/fips_dssvs.c b/fips-1.0/dsa/fips_dssvs.c
similarity index 100%
rename from fips/dsa/fips_dssvs.c
rename to fips-1.0/dsa/fips_dssvs.c
diff --git a/fips/fips-lib.com b/fips-1.0/fips-lib.com
similarity index 100%
rename from fips/fips-lib.com
rename to fips-1.0/fips-lib.com
diff --git a/fips/fips.c b/fips-1.0/fips.c
similarity index 100%
rename from fips/fips.c
rename to fips-1.0/fips.c
diff --git a/fips/fips.h b/fips-1.0/fips.h
similarity index 100%
rename from fips/fips.h
rename to fips-1.0/fips.h
diff --git a/fips/fips_canister.c b/fips-1.0/fips_canister.c
similarity index 100%
rename from fips/fips_canister.c
rename to fips-1.0/fips_canister.c
diff --git a/fips/fips_err.h b/fips-1.0/fips_err.h
similarity index 100%
rename from fips/fips_err.h
rename to fips-1.0/fips_err.h
diff --git a/fips/fips_err_wrapper.c b/fips-1.0/fips_err_wrapper.c
similarity index 100%
rename from fips/fips_err_wrapper.c
rename to fips-1.0/fips_err_wrapper.c
diff --git a/fips/fips_locl.h b/fips-1.0/fips_locl.h
similarity index 100%
rename from fips/fips_locl.h
rename to fips-1.0/fips_locl.h
diff --git a/fips/fips_premain.c b/fips-1.0/fips_premain.c
similarity index 100%
rename from fips/fips_premain.c
rename to fips-1.0/fips_premain.c
diff --git a/fips-1.0/fips_premain_dso b/fips-1.0/fips_premain_dso
new file mode 100755
index 0000000000..514e237af7
Binary files /dev/null and b/fips-1.0/fips_premain_dso differ
diff --git a/fips/fips_test_suite.c b/fips-1.0/fips_test_suite.c
similarity index 100%
rename from fips/fips_test_suite.c
rename to fips-1.0/fips_test_suite.c
diff --git a/fips-1.0/fipscanister.o.sha1 b/fips-1.0/fipscanister.o.sha1
new file mode 100644
index 0000000000..2be7ef2764
--- /dev/null
+++ b/fips-1.0/fipscanister.o.sha1
@@ -0,0 +1 @@
+HMAC-SHA1(fipscanister.o)= 3ec9f9f0fb9c32ef4cdb93e757dab0f284f966f7
diff --git a/fips/fipshashes.c b/fips-1.0/fipshashes.c
similarity index 100%
rename from fips/fipshashes.c
rename to fips-1.0/fipshashes.c
diff --git a/fips/fipsld b/fips-1.0/fipsld
similarity index 90%
rename from fips/fipsld
rename to fips-1.0/fipsld
index acb6f6542c..5506b30943 100755
--- a/fips/fipsld
+++ b/fips-1.0/fipsld
@@ -49,9 +49,9 @@ case "${TARGET}" in
 *libcrypto*|*.dll)	# must be linking a shared lib...
 	# Shared lib creation can be taking place in the source
 	# directory only!!!
-	FINGERTYPE="${THERE}/fips/sha/fips_standalone_sha1"
-	CANISTER_O="${THERE}/fips/fipscanister.o"
-	PREMAIN_C="${THERE}/fips/fips_premain.c"
+	FINGERTYPE="${THERE}/fips-1.0/sha/fips_standalone_sha1"
+	CANISTER_O="${THERE}/fips-1.0/fipscanister.o"
+	PREMAIN_C="${THERE}/fips-1.0/fips_premain.c"
 
 	# verify fipscanister.o against its detached signature...
 	${FINGERTYPE} "${CANISTER_O}" | sed "s/(.*\//(/" | \
@@ -80,7 +80,7 @@ case "${TARGET}" in
 		${_WL_PREMAIN} "$@"
 
 	# generate signature...
-	SIG=`("${THERE}/fips/fips_premain_dso" "${TARGET}" || rm "${TARGET}")`
+	SIG=`("${THERE}/fips-1.0/fips_premain_dso" "${TARGET}" || rm "${TARGET}")`
 	if [ -z "${SIG}" ]; then
 	   echo "unable to collect signature"; exit 1
 	fi
@@ -94,10 +94,10 @@ case "${TARGET}" in
 *)	# must be linking statically...
 	# Static linking can be taking place either in the source
 	# directory or off the installed binary target destination.
-	if [ -x "${THERE}/fips/sha/fips_standalone_sha1" ]; then
-		FINGERTYPE="${THERE}/fips/sha/fips_standalone_sha1"
-		CANISTER_O="${THERE}/fips/fipscanister.o"
-		PREMAIN_C="${THERE}/fips/fips_premain.c"
+	if [ -x "${THERE}/fips-1.0/sha/fips_standalone_sha1" ]; then
+		FINGERTYPE="${THERE}/fips-1.0/sha/fips_standalone_sha1"
+		CANISTER_O="${THERE}/fips-1.0/fipscanister.o"
+		PREMAIN_C="${THERE}/fips-1.0/fips_premain.c"
 	else	# Installed tree is expected to contain
 		# lib/fipscanister.o, lib/fipscanister.o.sha1 and
 		# lib/fips_premain.c [not to mention bin/openssl].
diff --git a/fips/hmac/.cvsignore b/fips-1.0/hmac/.cvsignore
similarity index 100%
rename from fips/hmac/.cvsignore
rename to fips-1.0/hmac/.cvsignore
diff --git a/fips/hmac/Makefile b/fips-1.0/hmac/Makefile
similarity index 100%
rename from fips/hmac/Makefile
rename to fips-1.0/hmac/Makefile
diff --git a/fips/hmac/fips_hmac.c b/fips-1.0/hmac/fips_hmac.c
similarity index 100%
rename from fips/hmac/fips_hmac.c
rename to fips-1.0/hmac/fips_hmac.c
diff --git a/fips/hmac/fips_hmac_selftest.c b/fips-1.0/hmac/fips_hmac_selftest.c
similarity index 100%
rename from fips/hmac/fips_hmac_selftest.c
rename to fips-1.0/hmac/fips_hmac_selftest.c
diff --git a/fips/hmac/fips_hmactest.c b/fips-1.0/hmac/fips_hmactest.c
similarity index 100%
rename from fips/hmac/fips_hmactest.c
rename to fips-1.0/hmac/fips_hmactest.c
diff --git a/fips/install.com b/fips-1.0/install.com
similarity index 100%
rename from fips/install.com
rename to fips-1.0/install.com
diff --git a/fips/openssl_fips_fingerprint b/fips-1.0/openssl_fips_fingerprint
similarity index 100%
rename from fips/openssl_fips_fingerprint
rename to fips-1.0/openssl_fips_fingerprint
diff --git a/fips/rand/.cvsignore b/fips-1.0/rand/.cvsignore
similarity index 100%
rename from fips/rand/.cvsignore
rename to fips-1.0/rand/.cvsignore
diff --git a/fips/rand/Makefile b/fips-1.0/rand/Makefile
similarity index 100%
rename from fips/rand/Makefile
rename to fips-1.0/rand/Makefile
diff --git a/fips/rand/fips_rand.c b/fips-1.0/rand/fips_rand.c
similarity index 100%
rename from fips/rand/fips_rand.c
rename to fips-1.0/rand/fips_rand.c
diff --git a/fips/rand/fips_rand.h b/fips-1.0/rand/fips_rand.h
similarity index 100%
rename from fips/rand/fips_rand.h
rename to fips-1.0/rand/fips_rand.h
diff --git a/fips/rand/fips_rand_selftest.c b/fips-1.0/rand/fips_rand_selftest.c
similarity index 100%
rename from fips/rand/fips_rand_selftest.c
rename to fips-1.0/rand/fips_rand_selftest.c
diff --git a/fips/rand/fips_randtest.c b/fips-1.0/rand/fips_randtest.c
similarity index 100%
rename from fips/rand/fips_randtest.c
rename to fips-1.0/rand/fips_randtest.c
diff --git a/fips/rand/fips_rngvs.c b/fips-1.0/rand/fips_rngvs.c
similarity index 100%
rename from fips/rand/fips_rngvs.c
rename to fips-1.0/rand/fips_rngvs.c
diff --git a/fips/rsa/.cvsignore b/fips-1.0/rsa/.cvsignore
similarity index 100%
rename from fips/rsa/.cvsignore
rename to fips-1.0/rsa/.cvsignore
diff --git a/fips/rsa/Makefile b/fips-1.0/rsa/Makefile
similarity index 100%
rename from fips/rsa/Makefile
rename to fips-1.0/rsa/Makefile
diff --git a/fips/rsa/fips_rsa_eay.c b/fips-1.0/rsa/fips_rsa_eay.c
similarity index 100%
rename from fips/rsa/fips_rsa_eay.c
rename to fips-1.0/rsa/fips_rsa_eay.c
diff --git a/fips/rsa/fips_rsa_gen.c b/fips-1.0/rsa/fips_rsa_gen.c
similarity index 100%
rename from fips/rsa/fips_rsa_gen.c
rename to fips-1.0/rsa/fips_rsa_gen.c
diff --git a/fips/rsa/fips_rsa_selftest.c b/fips-1.0/rsa/fips_rsa_selftest.c
similarity index 100%
rename from fips/rsa/fips_rsa_selftest.c
rename to fips-1.0/rsa/fips_rsa_selftest.c
diff --git a/fips/rsa/fips_rsa_x931g.c b/fips-1.0/rsa/fips_rsa_x931g.c
similarity index 100%
rename from fips/rsa/fips_rsa_x931g.c
rename to fips-1.0/rsa/fips_rsa_x931g.c
diff --git a/fips/rsa/fips_rsagtest.c b/fips-1.0/rsa/fips_rsagtest.c
similarity index 100%
rename from fips/rsa/fips_rsagtest.c
rename to fips-1.0/rsa/fips_rsagtest.c
diff --git a/fips/rsa/fips_rsastest.c b/fips-1.0/rsa/fips_rsastest.c
similarity index 100%
rename from fips/rsa/fips_rsastest.c
rename to fips-1.0/rsa/fips_rsastest.c
diff --git a/fips/rsa/fips_rsavtest.c b/fips-1.0/rsa/fips_rsavtest.c
similarity index 100%
rename from fips/rsa/fips_rsavtest.c
rename to fips-1.0/rsa/fips_rsavtest.c
diff --git a/fips/sha/.cvsignore b/fips-1.0/sha/.cvsignore
similarity index 100%
rename from fips/sha/.cvsignore
rename to fips-1.0/sha/.cvsignore
diff --git a/fips/sha/Makefile b/fips-1.0/sha/Makefile
similarity index 100%
rename from fips/sha/Makefile
rename to fips-1.0/sha/Makefile
diff --git a/fips/sha/SHAmix.fax b/fips-1.0/sha/SHAmix.fax
similarity index 100%
rename from fips/sha/SHAmix.fax
rename to fips-1.0/sha/SHAmix.fax
diff --git a/fips/sha/SHAmix.req b/fips-1.0/sha/SHAmix.req
similarity index 100%
rename from fips/sha/SHAmix.req
rename to fips-1.0/sha/SHAmix.req
diff --git a/fips/sha/asm/fips-sx86-elf.s b/fips-1.0/sha/asm/fips-sx86-elf.s
similarity index 100%
rename from fips/sha/asm/fips-sx86-elf.s
rename to fips-1.0/sha/asm/fips-sx86-elf.s
diff --git a/fips/sha/fips_md32_common.h b/fips-1.0/sha/fips_md32_common.h
similarity index 100%
rename from fips/sha/fips_md32_common.h
rename to fips-1.0/sha/fips_md32_common.h
diff --git a/fips/sha/fips_sha.h b/fips-1.0/sha/fips_sha.h
similarity index 100%
rename from fips/sha/fips_sha.h
rename to fips-1.0/sha/fips_sha.h
diff --git a/fips/sha/fips_sha1_selftest.c b/fips-1.0/sha/fips_sha1_selftest.c
similarity index 100%
rename from fips/sha/fips_sha1_selftest.c
rename to fips-1.0/sha/fips_sha1_selftest.c
diff --git a/fips/sha/fips_sha1dgst.c b/fips-1.0/sha/fips_sha1dgst.c
similarity index 100%
rename from fips/sha/fips_sha1dgst.c
rename to fips-1.0/sha/fips_sha1dgst.c
diff --git a/fips/sha/fips_sha256.c b/fips-1.0/sha/fips_sha256.c
similarity index 100%
rename from fips/sha/fips_sha256.c
rename to fips-1.0/sha/fips_sha256.c
diff --git a/fips/sha/fips_sha512.c b/fips-1.0/sha/fips_sha512.c
similarity index 100%
rename from fips/sha/fips_sha512.c
rename to fips-1.0/sha/fips_sha512.c
diff --git a/fips/sha/fips_sha_locl.h b/fips-1.0/sha/fips_sha_locl.h
similarity index 100%
rename from fips/sha/fips_sha_locl.h
rename to fips-1.0/sha/fips_sha_locl.h
diff --git a/fips/sha/fips_shatest.c b/fips-1.0/sha/fips_shatest.c
similarity index 100%
rename from fips/sha/fips_shatest.c
rename to fips-1.0/sha/fips_shatest.c
diff --git a/fips/sha/fips_standalone_sha1.c b/fips-1.0/sha/fips_standalone_sha1.c
similarity index 100%
rename from fips/sha/fips_standalone_sha1.c
rename to fips-1.0/sha/fips_standalone_sha1.c
diff --git a/test/Makefile b/test/Makefile
index 43c323c18e..2f23e3908f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -337,7 +337,7 @@ BUILD_CMD=SHARED_LIBS="$(SHARED_LIBS)"; \
 	fi
 
 FIPS_BUILD_CMD=if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
-	  FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
+	  FIPSLD_CC=$(CC); CC=$(TOP)/fips-1.0/fipsld; export CC FIPSLD_CC; \
 	fi; $(BUILD_CMD)
 
 $(FIPS_AESTEST)$(EXE_EXT): $(FIPS_AESTEST).o $(DLIBCRYPTO)