diff --git a/FindPIP.cmake b/FindPIP.cmake
index b1b5fb5c..81a81d2d 100644
--- a/FindPIP.cmake
+++ b/FindPIP.cmake
@@ -1,36 +1,24 @@
 #set(_PIP_MODULES pip pip_usb pip_crypt pip_fftw)
 if(WIN32)
 	find_package(MinGW REQUIRED)
-	find_library(PIP_LIBRARY pip ${MINGW_LIB})
-	find_library(PIP_USB_LIBRARY pip_usb ${MINGW_LIB})
-	find_library(PIP_CRYPT_LIBRARY pip_crypt ${MINGW_LIB})
-	find_library(PIP_FFTW_LIBRARY pip_fftw ${MINGW_LIB})
-	find_library(PIP_COMPRESS_LIBRARY pip_compress ${MINGW_LIB})
-	set(PIP_INCLUDES ${MINGW_INCLUDE}/pip)
-	set(PIP_CMG ${MINGW_BIN}/pip_cmg.exe)
-	set(PIP_RC ${MINGW_BIN}/pip_rc.exe)
-else()
-	set(_DIR_ "/usr")
-	if(APPLE)
-		set(_DIR_ "/usr/local")
+endif()
+find_library(PIP_LIBRARY pip HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib)
+find_library(PIP_USB_LIBRARY pip_usb HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib)
+find_library(PIP_CRYPT_LIBRARY pip_crypt HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib)
+find_library(PIP_FFTW_LIBRARY pip_fftw HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib)
+find_library(PIP_COMPRESS_LIBRARY pip_compress HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib)
+find_file(PIP_H_INCLUDE "pip.h" HINTS ${PIP_DIR}/include/pip ${MINGW_INCLUDE}/pip /usr/include/pip /usr/local/include/pip)
+get_filename_component(PIP_INCLUDES ${PIP_H_INCLUDE} PATH)
+find_program(PIP_CMG pip_cmg HINTS ${PIP_DIR}/bin ${MINGW_BIN} /usr/bin /usr/local/bin)
+find_program(PIP_RC pip_rc HINTS ${PIP_DIR}/bin ${MINGW_BIN} /usr/bin /usr/local/bin)
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+	find_library(DL_LIBRARY dl)
+	list(APPEND PIP_LIBRARY ${DL_LIBRARY})
+	if (NOT DEFINED ANDROID_PLATFORM)
+		find_library(PTHREAD_LIBRARY pthread)
+		find_library(UTIL_LIBRARY util)
+		list(APPEND PIP_LIBRARY ${PTHREAD_LIBRARY} ${UTIL_LIBRARY})
 	endif()
-	find_library(PIP_LIBRARY pip ${_DIR_}/lib/)
-	find_library(PIP_USB_LIBRARY pip_usb ${_DIR_}/lib/)
-	find_library(PIP_CRYPT_LIBRARY pip_crypt ${_DIR_}/lib/)
-	find_library(PIP_FFTW_LIBRARY pip_fftw ${_DIR_}/lib/)
-	find_library(PIP_COMPRESS_LIBRARY pip_compress ${_DIR_}/lib/)
-	if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-		find_library(DL_LIBRARY dl)
-		list(APPEND PIP_LIBRARY ${DL_LIBRARY})
-		if (NOT DEFINED ANDROID_PLATFORM)
-			find_library(PTHREAD_LIBRARY pthread)
-			find_library(UTIL_LIBRARY util)
-			list(APPEND PIP_LIBRARY ${PTHREAD_LIBRARY} ${UTIL_LIBRARY})
-		endif()
-	endif()
-	set(PIP_INCLUDES ${_DIR_}/include/pip)
-	set(PIP_CMG ${_DIR_}/bin/pip_cmg)
-	set(PIP_RC ${_DIR_}/bin/pip_rc)
 endif()
 
 if(NOT PIP_VERSION)