--- a/components/openssl/openssl-1.0.1-fips-140/Makefile	Tue Nov 11 14:04:02 2014 -0800
+++ b/components/openssl/openssl-1.0.1-fips-140/Makefile	Wed Nov 12 07:47:08 2014 -0800
@@ -25,6 +25,9 @@
 include ../../../make-rules/shared-macros.mk
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin
+endif
 
 COMPONENT_NAME =	openssl-fips-140
 # Note that this is the OpenSSL version that is used to build FIPS-140 certified
@@ -129,9 +132,6 @@
    ( [ $(BITS) -eq 32 ] && $(GPATCH) -p1 $(@D)/crypto/opensslconf.h \
       patches-post-config/opensslconf.patch; cd $(@D); $(MAKE) depend; )
 
-# Enable ASLR for this component
-ASLR_MODE = $(ASLR_ENABLE)
-
 # We must make sure that openssl-fips component is built before this 1.0.1
 # component since in order to build FIPS-140 certified libraries, the canister
 # is needed. Note that we must unset BITS that would override the same variable