diff --git a/ChangeLog b/ChangeLog
index 6910a8d21..e95fc1298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-07-29	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* plugins/ladspa_effect/tap/CMakeLists.txt:
+	* plugins/ladspa_effect/caps/CMakeLists.txt:
+	fixed linker-flags
+
 	* plugins/spectrum_analyzer/spectrum_analyzer.cpp:
 	* plugins/spectrum_analyzer/spectrum_analyzer.h:
 	* include/fft_helpers.h:
diff --git a/plugins/ladspa_effect/caps/CMakeLists.txt b/plugins/ladspa_effect/caps/CMakeLists.txt
index d517bc030..5680a038c 100644
--- a/plugins/ladspa_effect/caps/CMakeLists.txt
+++ b/plugins/ladspa_effect/caps/CMakeLists.txt
@@ -13,7 +13,12 @@ ELSE(NO_O3)
 ENDIF(NO_O3)
 
 
-SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -no-undefined")
+IF(LMMS_BUILD_APPLE)
+	SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -no-undefined")
+ELSE(LMMS_BUILD_APPLE)
+	SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined")
+ENDIF(LMMS_BUILD_APPLE)
+
 IF(LMMS_BUILD_LINUX)
 	SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles")
 	INSTALL(TARGETS caps LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa)
diff --git a/plugins/ladspa_effect/tap/CMakeLists.txt b/plugins/ladspa_effect/tap/CMakeLists.txt
index 7710a845c..3d9af5681 100644
--- a/plugins/ladspa_effect/tap/CMakeLists.txt
+++ b/plugins/ladspa_effect/tap/CMakeLists.txt
@@ -1,12 +1,15 @@
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
-#SET(CMAKE_BUILD_TYPE release)
 FILE(GLOB PLUGIN_SOURCES *.c)
 FOREACH(_item ${PLUGIN_SOURCES})
 	GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)
 	ADD_LIBRARY(${_plugin} SHARED ${_item})
 	SET_TARGET_PROPERTIES(${_plugin} PROPERTIES PREFIX "")
 	SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "-O3 -Wno-write-strings -Wall -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math -c -fPIC -DPIC")
-	SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -no-undefined -Bsymbolic -lm")
+	IF(LMMS_BUILD_APPLE)
+		SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -no-undefined -Bsymbolic -lm")
+	ELSE(LMMS_BUILD_APPLE)
+		SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm")
+	ENDIF(LMMS_BUILD_APPLE)
 	IF(LMMS_BUILD_LINUX)
 		SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles")
 		INSTALL(TARGETS ${_plugin} LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa)