diff --git a/configure.ac b/configure.ac
index d602da3b05..4b3a58a9cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1044,6 +1044,7 @@ if echo $host_os | grep '^darwin' >/dev/null ; then
 fi
 
 AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep '^linux' > /dev/null])
+AM_CONDITIONAL(OS_FREEBSD, [echo $host_os | grep '^freebsd' > /dev/null])
 dnl In case anyone wants to try building the windows code using mingw!
 AM_CONDITIONAL(OS_WIN32, [echo $host_os | egrep '^mingw|^winnt' > /dev/null])
 AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c9f29552c8..b9a662bbc5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -185,6 +185,9 @@ libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
 libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 libboinc_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
+if OS_FREEBSD
+libboinc_la_LDFLAGS += -lexecinfo
+endif
 libboinc_la_LIBADD =
 
 if ENABLE_BOINCCRYPT