diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h
index b388f727a..a52ba52be 100644
--- a/include/AudioPortAudio.h
+++ b/include/AudioPortAudio.h
@@ -45,7 +45,11 @@ public:
 
 #ifdef LMMS_HAVE_PORTAUDIO
 
+#if defined(__FreeBSD__)
+#include <portaudio2/portaudio.h>
+#else
 #include <portaudio.h>
+#endif
 
 #include "AudioDevice.h"
 
diff --git a/include/lmms_math.h b/include/lmms_math.h
index 1e3b530ae..b4d8995a0 100644
--- a/include/lmms_math.h
+++ b/include/lmms_math.h
@@ -34,7 +34,7 @@
 #include <cmath>
 using namespace std;
 
-#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU)
+#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU)  || defined (__FreeBSD__)
 #ifndef isnanf
 #define isnanf(x)	isnan(x)
 #endif
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 34dbb1aca..92709423e 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,3 +1,7 @@
+INCLUDE_DIRECTORIES(
+	${SAMPLERATE_INCLUDE_DIRS}
+)
+
 ADD_SUBDIRECTORY(Amplifier)
 ADD_SUBDIRECTORY(audio_file_processor)
 ADD_SUBDIRECTORY(BassBooster)
diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index 77569dd78..264b5f81c 100644
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -147,7 +147,7 @@ ENDIF(LMMS_BUILD_WIN32)
 
 # FLTK needs X
 IF(LMMS_BUILD_LINUX)
-	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -ldl)
+	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${CMAKE_DL_LIBS})
 ENDIF(LMMS_BUILD_LINUX)