diff --git a/ChangeLog b/ChangeLog
index 816aa79a039825559392c76525849a6583bd3cc1..6009ace971d6b42d484804ff1c07eab401e23435 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-11  Niels Möller  <nisse@lysator.liu.se>
 
+	* aclocal.m4 (LSH_RPATH_INIT): Handle freebsd, in the same way as
+	gnu/linux, with -Wl,-rpath,.
+
 	Merged memxor-reorg changes, starting at 2014-10-23.
 
 2015-01-10  Niels Möller  <nisse@lysator.liu.se>
diff --git a/aclocal.m4 b/aclocal.m4
index 36daec6fce1988884a1740a2663c1d8b91fff352..b6846caee2579f72f5e7845cc44eb51b4075ea79 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -109,7 +109,7 @@ case "$host_os" in
       RPATHFLAG=-R
     fi
     ;;
-  linux*)		RPATHFLAG="-Wl,-rpath," ;;
+  linux*|freebsd*)	RPATHFLAG="-Wl,-rpath," ;;
   *)			RPATHFLAG="" ;;
 esac