diff --git a/configure.ac b/configure.ac
index 6c0a8dffecffa20a96506491bf2a0a608904d9a5..b743316e09898e4684b4d3a210679b1bbad2f234 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,9 +29,13 @@ case "${target_os}" in
   *mingw32* | *cygwin* | *wince* | *mingwce*)
     have_win32="yes"
     ;;
+  *bsd*)
+    have_bsd="yes"
+    ;;
 esac
 AM_CONDITIONAL(HAVE_DARWIN, test "${have_darwin}" = "yes")
 AM_CONDITIONAL(HAVE_WIN32, test "${have_win32}" = "yes")
+AM_CONDITIONAL(HAVE_BSD, test "${have_bsd}" = "yes")
 
 dnl --enable-debug
 AC_ARG_ENABLE(debug,
diff --git a/src/Makefile.am b/src/Makefile.am
index 00465f67b34a882d307745f7b6c33c8d32e7bb92..9797f90b9e738bea5bc4a1117ea9cfa13c29aada 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,9 +19,13 @@ else
 if HAVE_DARWIN
 libdvbpsi_la_LDFLAGS += -no-undefined
 else
+if HAVE_BSD
+libdvbpsi_la_LDFLAGS +=
+else
 libdvbpsi_la_LDFLAGS += -Wl,--no-undefined
 endif
 endif
+endif
 
 pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h \
                      tables/pat.h tables/pmt.h tables/sdt.h tables/eit.h \