diff --git a/configure b/configure
index 76909d289..ae025fdb7 100755
--- a/configure
+++ b/configure
@@ -20411,6 +20411,14 @@ if test "$ac_res" != no; then :
 
 fi
 
+			;;
+			*freebsd*|*FreeBSD)
+				case " $LIBOBJS " in
+  *" getentropy_freebsd.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getentropy_freebsd.$ac_objext"
+ ;;
+esac
+
 			;;
 			*linux*|Linux|*)
 				case " $LIBOBJS " in
diff --git a/doc/Changelog b/doc/Changelog
index a1981c931..0e0f1bd1f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 11 November 2019: Wouter
 	- Fix #109: check number of arguments for stdin-pipes in
 	  unbound-control and fail if too many arguments.
+	- Merge #102 from jrtc27: Add getentropy emulation for FreeBSD.
 
 24 October 2019: Wouter
 	- Fix #99: Memory leak in ub_ctx (event_base will never be freed).