diff --git a/ChangeLog.txt b/ChangeLog.txt
index e3304ad9..7ea9b121 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -12,6 +12,7 @@ Improvements:
 Compatibility:
 * Compatible with libcurl version >= 7.50.0, and <= 7.21.6 (tested down to 7.19.0)
 * Compatible with Crypto++ 5.6.4
+* Compatible with compilers running under hardening-wrapper
 
 Version 0.9.5
 ---------------
diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/Makefile.in b/vendor/scrypt/scrypt-1.2.0/scrypt/Makefile.in
index 34652e73..b26caa2e 100644
--- a/vendor/scrypt/scrypt-1.2.0/scrypt/Makefile.in
+++ b/vendor/scrypt/scrypt-1.2.0/scrypt/Makefile.in
@@ -1311,7 +1311,7 @@ uninstall-man: uninstall-man1
 
 
 cpusupport-config.h:
-	( export CC="${CC}"; export CFLAGS="${CFLAGS}"; command -p sh $(srcdir)/libcperciva/cpusupport/Build/cpusupport.sh ) > cpusupport-config.h.tmp && command -p mv cpusupport-config.h.tmp cpusupport-config.h
+	( export CC="${CC}"; export CFLAGS="${CFLAGS}"; command -p sh $(srcdir)/libcperciva/cpusupport/Build/cpusupport.sh "$$PATH") > cpusupport-config.h.tmp && command -p mv cpusupport-config.h.tmp cpusupport-config.h
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport.sh b/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport.sh
index 05051fdb..392e122d 100755
--- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport.sh
+++ b/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport.sh
@@ -1,5 +1,9 @@
-# Should be sourced by `command -p sh path/to/cpusupport.sh` from
+# Should be sourced by `command -p sh path/to/cpusupport.sh "$PATH"` from
 # within a Makefile.
+if ! [ ${PATH} = "$1" ]; then
+	echo "WARNING: POSIX violation: $SHELL's command -p resets \$PATH" 1>&2
+	PATH=$1
+fi
 # Standard output should be written to cpusupport-config.h, which is both a
 # C header file defining CPUSUPPORT_ARCH_FEATURE macros and sourceable sh
 # code which sets CFLAGS_ARCH_FEATURE environment variables.
@@ -9,6 +13,9 @@ feature() {
 	ARCH=$1
 	FEATURE=$2
 	shift 2;
+	if ! [ -f ${SRCDIR}/cpusupport-$ARCH-$FEATURE.c ]; then
+		return
+	fi
 	printf "Checking if compiler supports $ARCH $FEATURE feature..." 1>&2
 	for CFLAG in "$@"; do
 		if ${CC} ${CFLAGS} -D_POSIX_C_SOURCE=200809L ${CFLAG}	\
@@ -24,11 +31,11 @@ feature() {
 		;;
 	"")
 		echo " yes" 1>&2
-		echo "#define CPUSUPPORT_${ARCH}_${FEATURE}"
+		echo "#define CPUSUPPORT_${ARCH}_${FEATURE} 1"
 		;;
 	*)
 		echo " yes, via $CFLAG" 1>&2
-		echo "#define CPUSUPPORT_${ARCH}_${FEATURE}"
+		echo "#define CPUSUPPORT_${ARCH}_${FEATURE} 1"
 		echo "#ifdef cpusupport_dummy"
 		echo "export CFLAGS_${ARCH}_${FEATURE}=\"${CFLAG}\""
 		echo "#endif"