diff --git a/CMakeLists.txt b/CMakeLists.txt
index 983d5d05..e18fc73b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,7 +153,7 @@ if (FFTW)
 	if (WIN32)
 		list(APPEND LIBS fftw3-3 fftw3f-3 fftw3l-3)
 	else ()
-		list(APPEND LIBS fftw3 fftw3f)
+		list(APPEND LIBS fftw3 fftw3f fftw3_threads fftw3f_threads)
 	endif ()
 else ()
 	message(STATUS "Building without fftw3 support")
@@ -231,7 +231,11 @@ if (LIB)
 			install(TARGETS pip DESTINATION ${MINGW_BIN})
 		endif ()
 	else ()
-		set(CMAKE_INSTALL_PREFIX /usr)
+		if (APPLE)
+			set(CMAKE_INSTALL_PREFIX /usr/local)
+		else()
+                        set(CMAKE_INSTALL_PREFIX /usr)
+		endif()
 		install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
 		install(TARGETS pip DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
diff --git a/src/console/piterminal.cpp b/src/console/piterminal.cpp
index 5cbebea0..95136b26 100644
--- a/src/console/piterminal.cpp
+++ b/src/console/piterminal.cpp
@@ -31,7 +31,11 @@
 #  if defined(QNX) || defined(BLACKBERRY)
 #    include <unix.h>
 #  else
-#    include <pty.h>
+#    ifdef MAC_OS
+#      include <util.h>
+#    else
+#      include <pty.h>
+#    endif
 #  endif
 #endif