diff --git a/cmake/modules/FindQxmpp.cmake b/cmake/modules/FindQxmpp.cmake
index 420186d969..ac10982d61 100644
--- a/cmake/modules/FindQxmpp.cmake
+++ b/cmake/modules/FindQxmpp.cmake
@@ -18,17 +18,15 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 
-if (QXMPP_LIBRARIES AND QXMPP_INCLUDE_DIRS)
-  # in cache already
-  set(QXMPP_FOUND TRUE)
-else ()
-  
-  set(QXMPP_SEARCH_DIRS "${QXMPP_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/qxmpp")
-  
-  find_path(QXMPP_INCLUDE_DIR QXmppClient.h PATH_SUFFIXES include/qxmpp HINTS ${QXMPP_SEARCH_DIRS})
+set(QXMPP_SEARCH_DIRS "${QXMPP_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/qxmpp")
 
-  find_library(QXMPP_LIBRARY NAMES qxmpp qxmpp0 qxmpp_d PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})
-  
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(QXMPP DEFAULT_MSG QXMPP_INCLUDE_DIR QXMPP_LIBRARY)
-endif ()
\ No newline at end of file
+find_path(QXMPP_INCLUDE_DIR QXmppClient.h PATH_SUFFIXES include/qxmpp HINTS ${QXMPP_SEARCH_DIRS})
+
+find_library(QXMPP_LIBRARY_RELEASE NAMES qxmpp PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})
+find_library(QXMPP_LIBRARY_DEBUG NAMES qxmpp_d PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})
+
+include(SelectLibraryConfigurations)
+select_library_configurations(QXMPP)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QXMPP DEFAULT_MSG QXMPP_INCLUDE_DIR QXMPP_LIBRARY)
\ No newline at end of file
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 201487105d..7ce9144031 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -222,7 +222,7 @@ if (QXMPP_FOUND AND NOT DISABLE_QXMPP)
   add_definitions(-DHAVE_QXMPP -DQXMPP_STATIC)
   include_directories(SYSTEM ${QXMPP_INCLUDE_DIR})
 
-  target_link_libraries(${TARGET_NAME} "${QXMPP_LIBRARY}")
+  target_link_libraries(${TARGET_NAME} ${QXMPP_LIBRARY})
 endif (QXMPP_FOUND AND NOT DISABLE_QXMPP)
 
 # and with RtMidi for RtMidi control