--- configure.orig	2009-08-24 10:39:07.000000000 +0200
+++ configure	2009-08-24 10:44:47.000000000 +0200
@@ -15988,6 +15988,14 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 	;;
+*freebsd*)
+	os_win32=no
+	NO_UNDEFINED=''
+	SOCKET_LIBS=''
+	DL_LIB=''
+	SOFTOKN3_LIB='-lsoftokn3'
+	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
+	;;
 *)
 	os_win32=no
 	NO_UNDEFINED=''
@@ -24777,7 +24785,7 @@ idldir='${datadir}'/idl/evolution-data-s
 imagesdir='${datadir}'/pixmaps/evolution-data-server
 
 
-serverdir="$libdir/bonobo/servers"
+serverdir="$prefix/libdata/bonobo/servers"
 
 
 extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions