diff --git a/libs/libzrtp/configure.in b/libs/libzrtp/configure.in
index 963a95dd71..2d10359a08 100644
--- a/libs/libzrtp/configure.in
+++ b/libs/libzrtp/configure.in
@@ -24,7 +24,6 @@ case $target_os in
   ;;
   *freebsd2* | *freebsd* | *netbsd* | *openbsd* | *osf[12]*)
   echo "------- START libzrtp configuration for BSD platform ------------"
-  AC_DEFINE(PLATFORM,ZP_BSD,BSD platform)
   ;;
   hpux* | irix* | linuxaout* | linux* | osf* | solaris2* | sunos4*)
   echo "------- START libzrtp configuration for Linux platform ------------"
@@ -84,12 +83,11 @@ AC_DEFINE(INLINE,[static inline],[Define inline construction for your platform])
 #
 # Documentation
 #
+AM_CONDITIONAL([HAVE_DOXYGEN], [false])
 AC_CHECK_PROGS([DOXYGEN], [doxygen])
-if test -z "$DOXYGEN";
-   then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
-fi
-
-if test -n "$DOXYGEN"; then
+if test -z "$DOXYGEN"; then
+  AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
+else
   AM_CONDITIONAL([HAVE_DOXYGEN], [true])
   AC_CONFIG_FILES([doc/Doxyfile])
 fi
diff --git a/libs/libzrtp/include/zrtp_config.h b/libs/libzrtp/include/zrtp_config.h
index d781043fde..3f954fc836 100644
--- a/libs/libzrtp/include/zrtp_config.h
+++ b/libs/libzrtp/include/zrtp_config.h
@@ -19,6 +19,8 @@
 #if !defined(ZRTP_PLATFORM)
 #	if defined(ANDROID_NDK)
 #		define ZRTP_PLATFORM ZP_ANDROID
+#	elif defined(__FreeBSD__)
+#		define ZRTP_PLATFORM ZP_BSD
 #	elif defined(linux) || defined(__linux)
 #		include <linux/version.h>
 #		define ZRTP_PLATFORM ZP_LINUX