Index: openssl-1.0.1p/Makefile.org
===================================================================
--- openssl-1.0.1p.orig/Makefile.org
+++ openssl-1.0.1p/Makefile.org
@@ -296,14 +296,14 @@ build_testapps:
 fips_premain_dso$(EXE_EXT): libcrypto.a
 	[ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \
 		-DFINGERPRINT_PREMAIN_DSO_LOAD -o $@  \
-		$(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \
+		$(FIPSLIBDIR)/fips_premain.c $(FIPSLIBDIR)/fipscanister.o \
 		libcrypto.a $(EX_LIBS)
 
 libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
 		if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
 			FIPSLD_LIBCRYPTO=libcrypto.a ; \
-			FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
+			FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/fips/fipsld; \
 			export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
 		fi; \
 		$(MAKE) -e SHLIBDIRS=crypto  CC="$${CC:-$(CC)}" build-shared && \
Index: openssl-1.0.1p/test/Makefile
===================================================================
--- openssl-1.0.1p.orig/test/Makefile
+++ openssl-1.0.1p/test/Makefile
@@ -379,7 +379,7 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$
 	fi; \
 	LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
 	if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
-		FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
+		FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/fips/fipsld; export CC FIPSLD_CC; \
 	fi; \
 	$(MAKE) -f $(TOP)/Makefile.shared -e \
 		CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
Index: openssl-1.0.1p/crypto/Makefile
===================================================================
--- openssl-1.0.1p.orig/crypto/Makefile
+++ openssl-1.0.1p/crypto/Makefile
@@ -102,7 +102,7 @@ lib:	$(LIB)
 	@touch lib
 $(LIB):	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
-	[ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
+	[ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)/fipscanister.o
 	$(RANLIB) $(LIB) || echo Never mind.
 
 shared: buildinf.h lib subdirs
Index: openssl-1.0.1p/apps/Makefile
===================================================================
--- openssl-1.0.1p.orig/apps/Makefile
+++ openssl-1.0.1p/apps/Makefile
@@ -157,7 +157,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(
 	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
 		shlib_target="$(SHLIB_TARGET)"; \
 	elif [ -n "$(FIPSCANLIB)" ]; then \
-	  FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
+	  FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/fips/fipsld; export CC FIPSLD_CC; \
 	fi; \
 	LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
 	$(MAKE) -f $(TOP)/Makefile.shared -e \