diff --git a/CMakeLists.txt b/CMakeLists.txt
index 042fa123..22e9250a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(Plasma)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.8)
 
 # Set up Product Identification parameters
 set(PRODUCT_BRANCH_ID   "1"         CACHE STRING "Branch ID")
diff --git a/Sources/Plasma/Apps/plClient/CMakeLists.txt b/Sources/Plasma/Apps/plClient/CMakeLists.txt
index 1a7a308a..1a94270e 100644
--- a/Sources/Plasma/Apps/plClient/CMakeLists.txt
+++ b/Sources/Plasma/Apps/plClient/CMakeLists.txt
@@ -153,13 +153,7 @@ target_link_libraries(plClient pnTimer)
 target_link_libraries(plClient pnUtils)
 target_link_libraries(plClient pnUUID)
 
-if(PYTHON_DEBUG_LIBRARY)
-    target_link_libraries(plClient debug ${PYTHON_DEBUG_LIBRARY})
-    target_link_libraries(plClient optimized ${PYTHON_LIBRARY})
-else()
-    target_link_libraries(plClient ${PYTHON_LIBRARY})
-endif()
-
+target_link_libraries(plClient ${PYTHON_LIBRARIES})
 target_link_libraries(plClient ${OPENAL_LIBRARY})
 target_link_libraries(plClient ${OPENSSL_LIBRARIES})
 target_link_libraries(plClient ${EXPAT_LIBRARY})
diff --git a/Sources/Plasma/Apps/plPythonPack/CMakeLists.txt b/Sources/Plasma/Apps/plPythonPack/CMakeLists.txt
index 13b196ab..86738ff1 100644
--- a/Sources/Plasma/Apps/plPythonPack/CMakeLists.txt
+++ b/Sources/Plasma/Apps/plPythonPack/CMakeLists.txt
@@ -14,13 +14,7 @@ set(plPythonPack_HEADERS
 
 add_executable(plPythonPack ${plPythonPack_SOURCES} ${plPythonPack_HEADERS})
 target_link_libraries(plPythonPack CoreLib plFile)
-
-if(PYTHON_DEBUG_LIBRARY)
-    target_link_libraries(plPythonPack debug ${PYTHON_DEBUG_LIBRARY})
-    target_link_libraries(plPythonPack optimized ${PYTHON_LIBRARY})
-else()
-    target_link_libraries(plPythonPack ${PYTHON_LIBRARY})
-endif()
+target_link_libraries(plPythonPack ${PYTHON_LIBRARIES})
 
 if(USE_VLD)
     target_link_libraries(plPythonPack ${VLD_LIBRARY})
diff --git a/Sources/Tools/MaxMain/CMakeLists.txt b/Sources/Tools/MaxMain/CMakeLists.txt
index c466354b..0df9965a 100644
--- a/Sources/Tools/MaxMain/CMakeLists.txt
+++ b/Sources/Tools/MaxMain/CMakeLists.txt
@@ -103,8 +103,7 @@ target_link_libraries(MaxMain ${Ogg_LIBRARIES})
 target_link_libraries(MaxMain ${OPENAL_LIBRARY})
 target_link_libraries(MaxMain ${OPENSSL_LIBRARIES})
 target_link_libraries(MaxMain ${PHYSX_LIBRARIES})
-target_link_libraries(MaxMain debug ${PYTHON_DEBUG_LIBRARY})
-target_link_libraries(MaxMain optimized ${PYTHON_LIBRARY})
+target_link_libraries(MaxMain ${PYTHON_LIBRARIES})
 target_link_libraries(MaxMain ${Speex_LIBRARY})
 target_link_libraries(MaxMain ${Vorbis_LIBRARIES})