diff --git a/src/projectM-jack/CMakeLists.txt b/src/projectM-jack/CMakeLists.txt
index 5a129bb9e..7e2bab7ad 100644
--- a/src/projectM-jack/CMakeLists.txt
+++ b/src/projectM-jack/CMakeLists.txt
@@ -12,8 +12,16 @@ pkg_search_module(JACK REQUIRED jack)
 
 ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"')
 
-INCLUDE_DIRECTORIES(${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${JACK_INCLUDEDIR}  ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
-LINK_DIRECTORIES(${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${JACK_LDFLAGS})
+if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+   set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine)
+   set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine)
+elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
+   set(PROJECTM_INCLUDE ${PROJECTM_INCLUDEDIR}/libprojectM)
+   set(PROJECTM_LINK ${PROJECTM_LDFLAGS})
+endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+
+INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR}  ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
+LINK_DIRECTORIES(${PROJECTM_LINK} ${JACK_LDFLAGS})
 
 TARGET_LINK_LIBRARIES(projectM-jack projectM  jack  ${SDL_LIBRARY} ${GTK_LIBRARIES})
 
diff --git a/src/projectM-libvisual/CMakeLists.txt b/src/projectM-libvisual/CMakeLists.txt
index 21a106fc0..e41eab1d6 100644
--- a/src/projectM-libvisual/CMakeLists.txt
+++ b/src/projectM-libvisual/CMakeLists.txt
@@ -11,8 +11,16 @@ pkg_search_module(LIBVISUAL REQUIRED libvisual-0.4)
 
 ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"')
 
-INCLUDE_DIRECTORIES(${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${LIBVISUAL_INCLUDEDIR} ${SDL_INCLUDE_DIR})
-LINK_DIRECTORIES(${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${LIBVISUAL_LDFLAGS})
+if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+   set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine)
+   set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine)
+elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
+   set(PROJECTM_INCLUDE ${PROJECTM_INCLUDEDIR}/libprojectM)
+   set(PROJECTM_LINK ${PROJECTM_LDFLAGS})
+endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+
+INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${LIBVISUAL_INCLUDEDIR} ${SDL_INCLUDE_DIR})
+LINK_DIRECTORIES(${PROJECTM_LINK} ${LIBVISUAL_LDFLAGS})
 
 TARGET_LINK_LIBRARIES(projectM_libvisual projectM  ${SDL_LIBRARY} ${LIBVISUAL_LIBRARIES})
 
diff --git a/src/projectM-test/CMakeLists.txt b/src/projectM-test/CMakeLists.txt
index 52d016878..7d66888b0 100644
--- a/src/projectM-test/CMakeLists.txt
+++ b/src/projectM-test/CMakeLists.txt
@@ -14,11 +14,19 @@ pkg_search_module(PROJECTM REQUIRED libprojectM)
 
 ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"')
 
-INCLUDE_DIRECTORIES(${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
-LINK_DIRECTORIES(${PROJECTM_ROOT_BINARY_DIR}/projectM-engine)
+if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+   set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine)
+   set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine)
+elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
+   set(PROJECTM_INCLUDE ${PROJECTM_INCLUDEDIR}/libprojectM)
+   set(PROJECTM_LINK ${PROJECTM_LDFLAGS})
+endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+
+INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
+LINK_DIRECTORIES(${PROJECTM_LINK})
 
 TARGET_LINK_LIBRARIES(projectM-test projectM  ${SDL_LIBRARY} ${GTK_LIBRARIES})
 TARGET_LINK_LIBRARIES(projectM-test-memleak projectM  ${SDL_LIBRARY} ${GTK_LIBRARIES})
 TARGET_LINK_LIBRARIES(projectM-test-texture projectM  ${SDL_LIBRARY} ${GTK_LIBRARIES})
 
-INSTALL(TARGETS projectM-test projectM-test-texture projectM-test-memleak DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+INSTALL(TARGETS projectM-test projectM-test-texture DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
diff --git a/src/projectM-xmms/CMakeLists.txt b/src/projectM-xmms/CMakeLists.txt
index 0cbb7f7cd..74baac631 100644
--- a/src/projectM-xmms/CMakeLists.txt
+++ b/src/projectM-xmms/CMakeLists.txt
@@ -21,7 +21,7 @@ endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
 
 INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
 
-LINK_DIRECTORIES(${PROJECM_LINK})
+LINK_DIRECTORIES(${PROJECTM_LINK})
 
 TARGET_LINK_LIBRARIES(xmms_projectM projectM  ${SDL_LIBRARY} ${GTK_LIBRARIES})
 
diff --git a/src/qprojectM/CMakeLists.txt b/src/qprojectM/CMakeLists.txt
index 0c7fc6993..97d136076 100644
--- a/src/qprojectM/CMakeLists.txt
+++ b/src/qprojectM/CMakeLists.txt
@@ -69,9 +69,18 @@ ADD_LIBRARY(qprojectM SHARED ${qprojectM_SRCS} ${qprojectM_RC_SRCS} ${qprojectM_
 
 SET_TARGET_PROPERTIES(qprojectM PROPERTIES VERSION 1.10 SOVERSION 1)
 
-LINK_DIRECTORIES(${PROJECTM_ROOT_BINARY_DIR})
 
-include_directories(${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${CMAKE_CURRENT_LIBRARY_DIR})
+if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+   set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine)
+   set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine)
+elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
+   set(PROJECTM_INCLUDE ${PROJECTM_INCLUDEDIR}/libprojectM)
+   set(PROJECTM_LINK ${PROJECTM_LDFLAGS})
+endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+
+LINK_DIRECTORIES(${PROJECTM_LINK})
+
+include_directories(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${CMAKE_CURRENT_LIBRARY_DIR})
 
 # link the "qprojectM" target against the Qt libraries. which libraries exactly, is defined by the "include(${QT_USE_FILE})" line above, which sets up this variable.
 target_link_libraries(qprojectM projectM ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})