diff --git a/cmake/macros/SetupHifiLibrary.cmake b/cmake/macros/SetupHifiLibrary.cmake
index c6a84e1838..fc6bd9117f 100644
--- a/cmake/macros/SetupHifiLibrary.cmake
+++ b/cmake/macros/SetupHifiLibrary.cmake
@@ -8,7 +8,7 @@ MACRO(SETUP_HIFI_LIBRARY TARGET)
     # create a library and set the property so it can be referenced later
     add_library(${TARGET} ${LIB_SRCS})
     
-    find_package(Qt5 REQUIRED QtCore)
+    find_package(Qt5Core REQUIRED)
     include(${QT_USE_FILE})
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")
 
diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake
index 80ced2ab73..27d768e3f5 100644
--- a/cmake/macros/SetupHifiProject.cmake
+++ b/cmake/macros/SetupHifiProject.cmake
@@ -8,7 +8,7 @@ MACRO(SETUP_HIFI_PROJECT TARGET INCLUDE_QT)
     add_executable(${TARGET} ${TARGET_SRCS})
     
     IF (${INCLUDE_QT})
-      find_package(Qt5 REQUIRED QtCore)
+      find_package(Qt5Core REQUIRED)
       include(${QT_USE_FILE})
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")
     ENDIF()
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index bc8949cbb6..ca99dda2f5 100755
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -67,7 +67,13 @@ if (APPLE)
   
 endif (APPLE)
 
-find_package(Qt5 REQUIRED QtCore QtGui QtNetwork QtOpenGL QtWebKit QtSvg)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5OpenGL REQUIRED)
+find_package(Qt5WebKit REQUIRED)
+find_package(Qt5Svg REQUIRED)
+
 include(${QT_USE_FILE})
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")
 
diff --git a/interface/external/fervor/CMakeLists.txt b/interface/external/fervor/CMakeLists.txt
index 9cba3816f8..111e69a865 100644
--- a/interface/external/fervor/CMakeLists.txt
+++ b/interface/external/fervor/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 project(Fervor)
-find_package(Qt5 REQUIRED)
+find_package(QtCore QtNetwork REQUIRED)
 
 add_definitions(-DFV_GUI)
 
diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
index 5827f94ebb..8afbae145b 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cm
 
 set(TARGET_NAME avatars)
 
-find_package(Qt5 REQUIRED QtCore)
+find_package(Qt5Core)
 include(${QT_USE_FILE})
 qt5_wrap_cpp(WRAPPED_SRCS src/AvatarData.h)
 
diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index 328221ba60..0dcf13f418 100644
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@@ -6,7 +6,7 @@ set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
 set(TARGET_NAME shared)
 project(${TARGET_NAME})
 
-find_package(Qt5 REQUIRED QtCore)
+find_package(Qt5Core REQUIRED)
 include(${QT_USE_FILE})
 qt5_wrap_cpp(WRAPPED_SRCS src/NodeData.h)