diff --git a/configure b/configure
index be12baaef..af2268d83 100755
--- a/configure
+++ b/configure
@@ -19632,7 +19632,7 @@ esac
 esac
 
 			;;
-			SunOS)
+			solaris|SunOS)
 				case " $LIBOBJS " in
   *" getentropy_solaris.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS getentropy_solaris.$ac_objext"
diff --git a/configure.ac b/configure.ac
index fd1c2771d..dd0f14f6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1219,7 +1219,7 @@ if test "$USE_NSS" = "no"; then
 			Darwin)
 				AC_LIBOBJ(getentropy_osx)
 			;;
-			SunOS)
+			solaris|SunOS)
 				AC_LIBOBJ(getentropy_solaris)
 				AC_CHECK_HEADERS([sys/sha2.h],, [
 					AC_CHECK_FUNCS([SHA512_Update],,[
diff --git a/doc/Changelog b/doc/Changelog
index 2872e0f96..6564b8e12 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+6 February 2017: Wouter
+	- Fix compile on solaris of the fix to use $host detect.
+
 4 February 2017: Wouter
 	- fix root_anchor test for updated icannbundle.pem lower certificates.