diff --git a/Toolchain-x86.cmake b/Toolchain-x86.cmake
new file mode 100644
index 000000000..120123a58
--- /dev/null
+++ b/Toolchain-x86.cmake
@@ -0,0 +1,14 @@
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_PROCESSOR "i686")
+
+SET(CMAKE_C_COMPILER clang)
+SET(CMAKE_CXX_COMPILER clang++)
+
+SET(BITS 32)
+
+if (EXISTS "/etc/debian_version")
+	SET (CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+else (EXISTS "/etc/debian_version")
+	SET (CMAKE_INSTALL_LIBDIR "lib32")
+endif (EXISTS "/etc/debian_version")
+
diff --git a/Toolchain-x86_64.cmake b/Toolchain-x86_64.cmake
new file mode 100644
index 000000000..fd3228bc4
--- /dev/null
+++ b/Toolchain-x86_64.cmake
@@ -0,0 +1,13 @@
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_PROCESSOR "x86-64")
+
+SET(CMAKE_C_COMPILER clang)
+SET(CMAKE_CXX_COMPILER clang++)
+SET(BITS 64)
+
+if (EXISTS "/etc/debian_version")
+	SET (CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+else (EXISTS "/etc/debian_version")
+	SET (CMAKE_INSTALL_LIBDIR "lib64")
+endif (EXISTS "/etc/debian_version")
+
diff --git a/src/AppKit/CMakeLists.txt b/src/AppKit/CMakeLists.txt
index 2933f74a5..a3806f675 100644
--- a/src/AppKit/CMakeLists.txt
+++ b/src/AppKit/CMakeLists.txt
@@ -35,7 +35,7 @@ set(AppKit_SRCS
 	QNSEventDispatcher.mm
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -44,5 +44,5 @@ add_library(AppKit SHARED ${AppKit_SRCS})
 target_link_libraries(AppKit -lgnustep-base -lX11)
 qt5_use_modules(AppKit Declarative Widgets Quick)
 
-install(TARGETS AppKit DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS AppKit DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/ApplicationServices/CMakeLists.txt b/src/ApplicationServices/CMakeLists.txt
index 415cdd666..1df518c1c 100644
--- a/src/ApplicationServices/CMakeLists.txt
+++ b/src/ApplicationServices/CMakeLists.txt
@@ -5,7 +5,7 @@ if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -13,5 +13,5 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 add_library(ApplicationServices SHARED dummy.c)
 target_link_libraries(ApplicationServices CoreServices)
 
-install(TARGETS ApplicationServices DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS ApplicationServices DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/AudioToolbox/CMakeLists.txt b/src/AudioToolbox/CMakeLists.txt
index 99ee5280b..176cd22b4 100644
--- a/src/AudioToolbox/CMakeLists.txt
+++ b/src/AudioToolbox/CMakeLists.txt
@@ -24,7 +24,7 @@ set(AudioToolbox_SRCS
 	AudioFile.cpp
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -32,5 +32,5 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 add_library(AudioToolbox SHARED ${AudioToolbox_SRCS})
 target_link_libraries(AudioToolbox util -lstdc++ -lavcodec -lavresample -lavformat CFF)
 
-install(TARGETS AudioToolbox DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS AudioToolbox DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/AudioUnit/CMakeLists.txt b/src/AudioUnit/CMakeLists.txt
index 8e4c2d9b2..1ea016ee4 100644
--- a/src/AudioUnit/CMakeLists.txt
+++ b/src/AudioUnit/CMakeLists.txt
@@ -71,7 +71,7 @@ if (ENABLE_PULSEAUDIO)
     list(APPEND SoundLibs "-lpulse")
 endif (ENABLE_PULSEAUDIO)
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -79,5 +79,5 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 add_library(AudioUnit SHARED ${AudioUnit_SRCS})
 target_link_libraries(AudioUnit -lstdc++ -lpthread ${SoundLibs} libdispatch_shared CFF)
 
-install(TARGETS AudioUnit DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS AudioUnit DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/CFF/CMakeLists.txt b/src/CFF/CMakeLists.txt
index b3449438c..908e2dddf 100644
--- a/src/CFF/CMakeLists.txt
+++ b/src/CFF/CMakeLists.txt
@@ -20,7 +20,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -nostdinc -nostdinc++ -D__DAR
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map")
 set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -56,4 +56,4 @@ add_library(CFFExtra SHARED ${cffextra_SRCS})
 target_link_libraries(CFFExtra CFF cxx)
 
 
-install(TARGETS CFF CFFExtra DESTINATION lib${SUFFIX}/darling)
+install(TARGETS CFF CFFExtra DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 34fa9f772..863fa1107 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,39 +11,35 @@ set(DARLING TRUE)
 set(DARLING_NO_EXECUTABLES OFF)
 enable_language(ASM)
 
-if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") AND (${CMAKE_C_FLAGS} MATCHES ".*-m32.*"))
-	set(CMAKE_SYSTEM_PROCESSOR "i686")
-	
+if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "i686|i386")
+	message(FATAL_ERROR "This software can only be built on x86-64 systems")
+endif (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "i686|i386")
+
+if (NOT BITS)
+	message(FATAL_ERROR "BITS is not specified (32/64)")
+endif (NOT BITS)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m${BITS}")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${BITS}")
+SET(CMAKE_ASM_FLAGS "-m${BITS}")
+SET(CMAKE_ASM-ATT_FLAGS "-m${BITS}")
+
+if (BITS EQUAL 32)
 	# Prevent building Darling executables (e.g. Bash)
 	set(DARLING_NO_EXECUTABLES ON)
-endif()
 
-if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32")
-	set(BITS 32)
+	SET(SUFFIX "32")
 	add_definitions(-DTARGET_CPU_X86=1 -D__LITTLE_ENDIAN__)
-	set(CMAKE_SYSTEM_PROCESSOR "i686")
 	set(DARLING_NO_EXECUTABLES ON)
-else(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32")
-	set(BITS 64)
-	add_definitions(-DTARGET_CPU_X86_64=1 -D__LITTLE_ENDIAN__)
-endif(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32")
-
-message(STATUS "Building for ${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_C_FLAGS}")
-
-if (CMAKE_INSTALL_LIBDIR STREQUAL "lib32")
-	set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -m32")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-	# We need to add -mlong-double-128 to support long double properly.
-	# With GCC, we could use -mlong-double-128, but Clang doesn't support that
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
-	set(CMAKE_ASM-ATT_FLAGS "-m32")
-	set(CMAKE_ASM_FLAGS "-m32")
-	SET(CMAKE_C_SIZEOF_DATA_PTR 4)
-	SET(SUFFIX "32")
-endif(CMAKE_INSTALL_LIBDIR STREQUAL "lib32")
-if (CMAKE_INSTALL_LIBDIR STREQUAL "lib64")
+
+else()
+
 	set(SUFFIX "64")
-endif (CMAKE_INSTALL_LIBDIR STREQUAL "lib64")
+	add_definitions(-DTARGET_CPU_X86_64=1 -D__LITTLE_ENDIAN__)
+
+endif()
+
+message(STATUS "Building for ${CMAKE_SYSTEM_PROCESSOR}, CFLAGS: ${CMAKE_C_FLAGS}, libdir: ${CMAKE_INSTALL_LIBDIR}")
 
 add_definitions(-D__APPLE__ -D__DYNAMIC__)
 
diff --git a/src/Carbon/CMakeLists.txt b/src/Carbon/CMakeLists.txt
index f23d7ce4a..458df27d4 100644
--- a/src/Carbon/CMakeLists.txt
+++ b/src/Carbon/CMakeLists.txt
@@ -16,7 +16,7 @@ set(Carbon_SRCS
 	#HIToolbox/MacWindows.cpp
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -24,5 +24,5 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 add_library(Carbon SHARED ${Carbon_SRCS})
 target_link_libraries(Carbon util CoreServices -lX11)
 
-install(TARGETS Carbon DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS Carbon DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/Cocoa/CMakeLists.txt b/src/Cocoa/CMakeLists.txt
index 5c4c5ec1e..364d0c969 100644
--- a/src/Cocoa/CMakeLists.txt
+++ b/src/Cocoa/CMakeLists.txt
@@ -5,7 +5,7 @@ if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -13,5 +13,5 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 add_library(Cocoa SHARED zero.c)
 target_link_libraries(Cocoa -lgnustep-gui CoreFoundation)
 
-install(TARGETS Cocoa DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS Cocoa DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/CommonCrypto/CMakeLists.txt b/src/CommonCrypto/CMakeLists.txt
index 788945deb..deab2e946 100644
--- a/src/CommonCrypto/CMakeLists.txt
+++ b/src/CommonCrypto/CMakeLists.txt
@@ -59,11 +59,11 @@ set(cc_SRCS
 	#Source/API/CommonSymmetricKeywrap.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(CommonCrypto SHARED ${cc_SRCS})
 target_link_libraries(CommonCrypto system_c system_kernel)
 
-install(TARGETS CommonCrypto DESTINATION lib${SUFFIX}/darling)
+install(TARGETS CommonCrypto DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/CoreGraphics/CMakeLists.txt b/src/CoreGraphics/CMakeLists.txt
index ca6915911..6570c556c 100644
--- a/src/CoreGraphics/CMakeLists.txt
+++ b/src/CoreGraphics/CMakeLists.txt
@@ -34,7 +34,7 @@ set(CoreGraphics_SRCS
 	CGContext.cpp
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -43,5 +43,5 @@ add_library(CoreGraphics SHARED ${CoreGraphics_SRCS})
 target_link_libraries(CoreGraphics -lopal -lgnustep-corebase -lX11 -lXrandr
 	-lgnustep-corebase ${QT_LIBRARIES})
 
-install(TARGETS CoreGraphics DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS CoreGraphics DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/CoreSecurity/CMakeLists.txt b/src/CoreSecurity/CMakeLists.txt
index 4b10d74ba..732916ddd 100644
--- a/src/CoreSecurity/CMakeLists.txt
+++ b/src/CoreSecurity/CMakeLists.txt
@@ -26,5 +26,5 @@ set(cs_SRCS
 add_library(CoreSecurity SHARED ${cs_SRCS})
 target_link_libraries(CoreSecurity)
 
-install(TARGETS CoreSecurity DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS CoreSecurity DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/CoreServices/CMakeLists.txt b/src/CoreServices/CMakeLists.txt
index 9b77ac04c..5776dd071 100644
--- a/src/CoreServices/CMakeLists.txt
+++ b/src/CoreServices/CMakeLists.txt
@@ -55,7 +55,7 @@ if (WITH_COREAUDIO)
 	set(EXTRA_LIBS AudioUnit)
 endif (WITH_COREAUDIO)
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -63,6 +63,6 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 add_library(CoreServices SHARED ${CoreServices_SRCS})
 target_link_libraries(CoreServices icucore system ${EXTRA_LIBS} CFF cxx iconv)
 
-install(TARGETS CoreServices DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS CoreServices DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 install(FILES SystemVersion.plist DESTINATION "share/darling")
 
diff --git a/src/CoreVideo/CMakeLists.txt b/src/CoreVideo/CMakeLists.txt
index 404df3e8d..46fb1a70b 100644
--- a/src/CoreVideo/CMakeLists.txt
+++ b/src/CoreVideo/CMakeLists.txt
@@ -17,7 +17,7 @@ set(CoreVideo_SRCS
 	CVDisplayLink.cpp
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -25,5 +25,5 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 add_library(CoreVideo SHARED ${CoreVideo_SRCS})
 target_link_libraries(CoreVideo util)
 
-install(TARGETS CoreVideo DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS CoreVideo DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/DiskArbitration/CMakeLists.txt b/src/DiskArbitration/CMakeLists.txt
index 16a9ea4f3..41f351bb5 100644
--- a/src/DiskArbitration/CMakeLists.txt
+++ b/src/DiskArbitration/CMakeLists.txt
@@ -16,7 +16,7 @@ add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map")
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -37,4 +37,4 @@ set(da_SRCS
 add_library(DiskArbitration SHARED ${da_SRCS})
 target_link_libraries(DiskArbitration PRIVATE system CFF)
 
-install(TARGETS DiskArbitration DESTINATION lib${SUFFIX}/darling)
+install(TARGETS DiskArbitration DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/ExceptionHandling/CMakeLists.txt b/src/ExceptionHandling/CMakeLists.txt
index f20b834ea..58e35d387 100644
--- a/src/ExceptionHandling/CMakeLists.txt
+++ b/src/ExceptionHandling/CMakeLists.txt
@@ -16,7 +16,7 @@ set(ExceptionHandling_SRCS
 	ExceptionHandler.mm
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -24,5 +24,5 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 add_library(ExceptionHandling SHARED ${ExceptionHandling_SRCS})
 target_link_libraries(ExceptionHandling util Foundation)
 
-install(TARGETS ExceptionHandling DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS ExceptionHandling DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/Foundation/CMakeLists.txt b/src/Foundation/CMakeLists.txt
index 338bb1a9b..aa0bc7f78 100644
--- a/src/Foundation/CMakeLists.txt
+++ b/src/Foundation/CMakeLists.txt
@@ -25,7 +25,7 @@ set(Foundation_SRCS
 	NSAppleEventManager.mm
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -33,5 +33,5 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 add_library(Foundation SHARED ${Foundation_SRCS})
 target_link_libraries(Foundation -lgnustep-base)
 
-install(TARGETS Foundation DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS Foundation DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/IOKit/CMakeLists.txt b/src/IOKit/CMakeLists.txt
index 4db94cf7b..4965e78ca 100644
--- a/src/IOKit/CMakeLists.txt
+++ b/src/IOKit/CMakeLists.txt
@@ -31,12 +31,12 @@ set(IOKit_SRCS
 	../util/debug.cpp
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(IOKit SHARED ${IOKit_SRCS})
 target_link_libraries(IOKit -ludev -lstdc++ CFF)
 
-install(TARGETS IOKit DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS IOKit DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/OpenGL/CMakeLists.txt b/src/OpenGL/CMakeLists.txt
index 3701e87a8..b0a4751c7 100644
--- a/src/OpenGL/CMakeLists.txt
+++ b/src/OpenGL/CMakeLists.txt
@@ -17,7 +17,7 @@ set(OpenGL_SRCS
 	OpenGL.cpp
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -25,5 +25,5 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 add_library(OpenGL SHARED ${OpenGL_SRCS})
 target_link_libraries(OpenGL util -lGL)
 
-install(TARGETS OpenGL DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS OpenGL DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/SystemConfiguration/CMakeLists.txt b/src/SystemConfiguration/CMakeLists.txt
index 0e766ab77..5f9d3f2aa 100644
--- a/src/SystemConfiguration/CMakeLists.txt
+++ b/src/SystemConfiguration/CMakeLists.txt
@@ -25,5 +25,5 @@ set(SystemConfiguration_SRCS
 add_library(SystemConfiguration SHARED ${SystemConfiguration_SRCS})
 target_link_libraries(SystemConfiguration -lgnustep-corebase)
 
-install(TARGETS SystemConfiguration DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS SystemConfiguration DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/VideoDecodeAcceleration/CMakeLists.txt b/src/VideoDecodeAcceleration/CMakeLists.txt
index e05634e8f..d9b2a190e 100644
--- a/src/VideoDecodeAcceleration/CMakeLists.txt
+++ b/src/VideoDecodeAcceleration/CMakeLists.txt
@@ -16,7 +16,7 @@ add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map")
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -35,4 +35,4 @@ set(vda_SRCS
 add_library(VideoDecodeAcceleration SHARED ${vda_SRCS})
 target_link_libraries(VideoDecodeAcceleration PRIVATE system CFF)
 
-install(TARGETS VideoDecodeAcceleration DESTINATION lib${SUFFIX}/darling)
+install(TARGETS VideoDecodeAcceleration DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/copyfile/CMakeLists.txt b/src/copyfile/CMakeLists.txt
index 901e76857..0722c5c0e 100644
--- a/src/copyfile/CMakeLists.txt
+++ b/src/copyfile/CMakeLists.txt
@@ -19,11 +19,11 @@ set(copyfile_sources
 	# xattr_flags.c # Doesn't build yet (XPC)
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(system_copyfile SHARED ${copyfile_sources})
 target_link_libraries(system_copyfile system_kernel system_c)
 
-install(TARGETS system_copyfile DESTINATION lib${SUFFIX}/darling)
+install(TARGETS system_copyfile DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/darling-config.h.in b/src/darling-config.h.in
index 8bc7395a3..300b6c22c 100644
--- a/src/darling-config.h.in
+++ b/src/darling-config.h.in
@@ -1,7 +1,7 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define LIB_PATH "${CMAKE_INSTALL_PREFIX}/lib@SUFFIX@/darling"
+#define LIB_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling"
 #define LIBEXEC_PATH "${CMAKE_INSTALL_PREFIX}/libexec/darling"
 #define LIB_DIR_NAME "lib@SUFFIX@"
 #define INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
diff --git a/src/duct/src/CMakeLists.txt b/src/duct/src/CMakeLists.txt
index a83e1d881..c8d5ed7e7 100644
--- a/src/duct/src/CMakeLists.txt
+++ b/src/duct/src/CMakeLists.txt
@@ -18,7 +18,7 @@ add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--unresolved-symbols=ignore-all -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map")
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -26,4 +26,4 @@ add_library(system_duct SHARED commpage.c libnotify.c numcpus.c
 	CRGetCrashLogMessage.c acl.c bootstrap.c dyld.c dns_sd.c
 	sa_dst_compare.c asl.c)
 
-install(TARGETS system_duct DESTINATION lib${SUFFIX}/darling)
+install(TARGETS system_duct DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/dyld/CMakeLists.txt b/src/dyld/CMakeLists.txt
index 7c5e5bea4..800d75948 100644
--- a/src/dyld/CMakeLists.txt
+++ b/src/dyld/CMakeLists.txt
@@ -14,7 +14,7 @@ set(dyld_SRCS
 )
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -ggdb -O0")
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/src/external/bash b/src/external/bash
index f711f4aa8..34280113b 160000
--- a/src/external/bash
+++ b/src/external/bash
@@ -1 +1 @@
-Subproject commit f711f4aa8555d7ace55a0cd01360bc3a1f99bffc
+Subproject commit 34280113bd880471889d1972199cedd060939c8c
diff --git a/src/external/bzip2 b/src/external/bzip2
index 8a41c5b31..52e26c1c6 160000
--- a/src/external/bzip2
+++ b/src/external/bzip2
@@ -1 +1 @@
-Subproject commit 8a41c5b319247922f9712484d239c2d974ac2ef7
+Subproject commit 52e26c1c69f2ad0bc8c6ab58daea94522677402e
diff --git a/src/external/cfnetwork b/src/external/cfnetwork
index 36889aec6..95f2c4d56 160000
--- a/src/external/cfnetwork
+++ b/src/external/cfnetwork
@@ -1 +1 @@
-Subproject commit 36889aec64045c379c99010e7601cc4e374fe998
+Subproject commit 95f2c4d56adbeb5444f138ca2f1ef3f675a56319
diff --git a/src/external/compiler-rt b/src/external/compiler-rt
index da5f68456..addf1e22f 160000
--- a/src/external/compiler-rt
+++ b/src/external/compiler-rt
@@ -1 +1 @@
-Subproject commit da5f684563f8b24ce1897df39771a7938c24dc58
+Subproject commit addf1e22f8f6c62372ec5611de2913a700911be2
diff --git a/src/external/corefoundation b/src/external/corefoundation
index 1fc8e839d..9f75398eb 160000
--- a/src/external/corefoundation
+++ b/src/external/corefoundation
@@ -1 +1 @@
-Subproject commit 1fc8e839d46d147c8c8ff1c2f98f4c8361ecd4f5
+Subproject commit 9f75398ebb3afdeaf8f351e11bc611f43ff86157
diff --git a/src/external/curl b/src/external/curl
index 3e802c398..7ab00a2ef 160000
--- a/src/external/curl
+++ b/src/external/curl
@@ -1 +1 @@
-Subproject commit 3e802c3989081a241838b687a93715ce9eae6c3e
+Subproject commit 7ab00a2ef56dc6e5c715d5444353ef0ceb2c8149
diff --git a/src/external/foundation b/src/external/foundation
index 6ebf21594..52453d919 160000
--- a/src/external/foundation
+++ b/src/external/foundation
@@ -1 +1 @@
-Subproject commit 6ebf21594f7d8b74b586ba3371f1409b8f910bff
+Subproject commit 52453d91913154a86fcfbb5de184818686bb53df
diff --git a/src/external/icu b/src/external/icu
index b49ba2400..b688ae371 160000
--- a/src/external/icu
+++ b/src/external/icu
@@ -1 +1 @@
-Subproject commit b49ba2400dc00eeedf06b2b0fe2c4fb5fcbdb1d7
+Subproject commit b688ae37168603876e23426955709b6371c7bdb7
diff --git a/src/external/installer b/src/external/installer
index 6cb823b48..8d637fefb 160000
--- a/src/external/installer
+++ b/src/external/installer
@@ -1 +1 @@
-Subproject commit 6cb823b4844d66a1498b1c3945b25aea6aaade0f
+Subproject commit 8d637fefb26d44aff142f3bf8f57af68089387a3
diff --git a/src/external/libcxx b/src/external/libcxx
index b460829bd..969c8a301 160000
--- a/src/external/libcxx
+++ b/src/external/libcxx
@@ -1 +1 @@
-Subproject commit b460829bd4d8b957c4f901abcb2cbf51c998d946
+Subproject commit 969c8a3011e76aa921e8f82f404672cfbd28dc26
diff --git a/src/external/libcxxabi b/src/external/libcxxabi
index 54f309472..6a1b3e2a0 160000
--- a/src/external/libcxxabi
+++ b/src/external/libcxxabi
@@ -1 +1 @@
-Subproject commit 54f3094728379c4a83c736c8f8f29b301f601217
+Subproject commit 6a1b3e2a0403d15a55ee9ed095c287b719858dd8
diff --git a/src/external/libdispatch b/src/external/libdispatch
index c8e3382df..eeef4804a 160000
--- a/src/external/libdispatch
+++ b/src/external/libdispatch
@@ -1 +1 @@
-Subproject commit c8e3382df77e6bc44b6831ba5aca5e37109d97a0
+Subproject commit eeef4804aee38cc39f5ce1c1d838d28d6e1948ad
diff --git a/src/external/liblzma b/src/external/liblzma
index 021f30634..11167a3b2 160000
--- a/src/external/liblzma
+++ b/src/external/liblzma
@@ -1 +1 @@
-Subproject commit 021f30634a547b63ebf20e208923c5a97f148746
+Subproject commit 11167a3b2ae8114b081cecd59f3bf21cfa1bd18f
diff --git a/src/external/libobjc2 b/src/external/libobjc2
index 086b00648..94d8584dd 160000
--- a/src/external/libobjc2
+++ b/src/external/libobjc2
@@ -1 +1 @@
-Subproject commit 086b00648bef8a8f86f149523a7f97482e765ecb
+Subproject commit 94d8584dd7f9410e97fce9611afe6c6164ea9135
diff --git a/src/external/libxml2 b/src/external/libxml2
index a20cc0dff..a6e9eb756 160000
--- a/src/external/libxml2
+++ b/src/external/libxml2
@@ -1 +1 @@
-Subproject commit a20cc0dff0c6c35cda084fa2573e735f1a705862
+Subproject commit a6e9eb7560352831de99b9f3aa001b991172faf6
diff --git a/src/external/libxslt b/src/external/libxslt
index 4f89be895..972ec3db1 160000
--- a/src/external/libxslt
+++ b/src/external/libxslt
@@ -1 +1 @@
-Subproject commit 4f89be89575f38c2339158331f97761542ec2b05
+Subproject commit 972ec3db18dd910f98cd4eca75a9bebcc6910777
diff --git a/src/external/openssl b/src/external/openssl
index f1f3126c9..a7c12bf25 160000
--- a/src/external/openssl
+++ b/src/external/openssl
@@ -1 +1 @@
-Subproject commit f1f3126c9a40da9d506b0f1cadc68354c4541047
+Subproject commit a7c12bf25b6d95baa9945e7c4fd63bbb6ff62124
diff --git a/src/external/pcre b/src/external/pcre
index 668b18a31..b5497a7b4 160000
--- a/src/external/pcre
+++ b/src/external/pcre
@@ -1 +1 @@
-Subproject commit 668b18a318fc6eee091b6a1258eafc53394e09ce
+Subproject commit b5497a7b4b8bce6eae7e713c51853c159d604be1
diff --git a/src/external/zlib b/src/external/zlib
index 9c5e2180d..1b7a6534f 160000
--- a/src/external/zlib
+++ b/src/external/zlib
@@ -1 +1 @@
-Subproject commit 9c5e2180d416bab5391b975725574d52cdc23f59
+Subproject commit 1b7a6534fcdaa4e2705cccf597af6e013edc8191
diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index 5511ae2de..3a7ba0970 100644
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -12,14 +12,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -msse3 -w -fblocks -ggdb")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__DARWIN_UNIX03 -fPIC -w -nostdinc")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/darwin.map")
 
-if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32")
-	set(BITS 32)
-	add_definitions(-DTARGET_CPU_X86=1)
-else(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32")
-	set(BITS 64)
-	add_definitions(-DTARGET_CPU_X86_64=1)
-endif(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32")
-
 include_directories(${DARLING_TOP_DIRECTORY}/kernel-include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -30,14 +22,10 @@ add_definitions(-D__APPLE__ -D__DYNAMIC__)
 add_subdirectory(libsyscall)
 add_subdirectory(mach_server/client)
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686")
-	# set (extra_objs $<TARGET_OBJECTS:libsyscall_legacy_extra>)
-endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686")
-
 add_library(system_kernel SHARED
 	$<TARGET_OBJECTS:libsyscall>
 	#$<TARGET_OBJECTS:kqueue>
@@ -46,6 +34,6 @@ add_library(system_kernel SHARED
 	$<TARGET_OBJECTS:mach_server_client>)
 target_link_libraries(system_kernel system_duct)
 
-install(TARGETS system_kernel DESTINATION lib${SUFFIX}/darling)
+install(TARGETS system_kernel DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
 add_dependencies(system_kernel migcom)
diff --git a/src/keymgr/CMakeLists.txt b/src/keymgr/CMakeLists.txt
index c42351121..7dd8b3d87 100644
--- a/src/keymgr/CMakeLists.txt
+++ b/src/keymgr/CMakeLists.txt
@@ -24,10 +24,10 @@ set(keymgr_sources
 	keymgr.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(keymgr SHARED ${keymgr_sources})
 
-install(TARGETS keymgr DESTINATION lib${SUFFIX}/darling)
+install(TARGETS keymgr DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/launchd/liblaunch/CMakeLists.txt b/src/launchd/liblaunch/CMakeLists.txt
index 9c2268b5d..00a8e1c1a 100644
--- a/src/launchd/liblaunch/CMakeLists.txt
+++ b/src/launchd/liblaunch/CMakeLists.txt
@@ -24,12 +24,12 @@ set(launch_sources
 	${CMAKE_CURRENT_BINARY_DIR}/helperServer.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(launch SHARED ${launch_sources})
 target_link_libraries(launch system_c system_kernel)
 
-install(TARGETS launch DESTINATION lib${SUFFIX}/darling)
+install(TARGETS launch DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
diff --git a/src/launchd/src/CMakeLists.txt b/src/launchd/src/CMakeLists.txt
index d12569e19..54d05f80a 100644
--- a/src/launchd/src/CMakeLists.txt
+++ b/src/launchd/src/CMakeLists.txt
@@ -48,7 +48,7 @@ set(launchd_sources
 	#${CMAKE_CURRENT_BINARY_DIR}/job_typesUser.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
diff --git a/src/libc/CMakeLists.txt b/src/libc/CMakeLists.txt
index 8ed6e4df7..4557adf36 100644
--- a/src/libc/CMakeLists.txt
+++ b/src/libc/CMakeLists.txt
@@ -83,13 +83,13 @@ if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686")
 	)
 endif()
 
-if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86.64")
 	add_subdirectory(x86_64)
 endif()
 
 add_subdirectory(darwin)
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -134,7 +134,7 @@ add_library(system_c SHARED
 	${extra_objs})
 target_link_libraries(system_c system_kernel system_m)
 
-install(TARGETS system_c DESTINATION lib${SUFFIX}/darling)
+install(TARGETS system_c DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
 # TODO: see ./xcodescripts/variants.xcconfig
 
diff --git a/src/libcrashhandler/CMakeLists.txt b/src/libcrashhandler/CMakeLists.txt
index b4ec57a6f..bcbbc184b 100644
--- a/src/libcrashhandler/CMakeLists.txt
+++ b/src/libcrashhandler/CMakeLists.txt
@@ -16,5 +16,5 @@ set_source_files_properties(${crashhandler_src} PROPERTIES LANGUAGE C) # Stupid
 add_library(crashhandler SHARED ${crashhandler_src})
 target_link_libraries(crashhandler -lgnustep-gui -lgnustep-base)
 
-install(TARGETS crashhandler DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS crashhandler DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/libdyld/CMakeLists.txt b/src/libdyld/CMakeLists.txt
index ee6421b1d..6cd012a60 100644
--- a/src/libdyld/CMakeLists.txt
+++ b/src/libdyld/CMakeLists.txt
@@ -59,7 +59,7 @@ set(dyld_SRCS
 
 #endif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -69,6 +69,6 @@ set_source_files_properties(environ.c COMPILE_FLAGS "-no-integrated-as")
 add_library(dyld SHARED ${dyld_SRCS})
 target_link_libraries(dyld PRIVATE -ldl -lpthread mach-o darling-util)
 
-install(TARGETS dyld DESTINATION lib${SUFFIX}/darling)
+install(TARGETS dyld DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
 
diff --git a/src/libedit/CMakeLists.txt b/src/libedit/CMakeLists.txt
index 6ff814a42..e5f1dfefc 100644
--- a/src/libedit/CMakeLists.txt
+++ b/src/libedit/CMakeLists.txt
@@ -14,7 +14,7 @@ add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map")
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -59,4 +59,4 @@ set(edit_SRCS
 add_library(edit SHARED ${edit_SRCS})
 target_link_libraries(edit PRIVATE system ncurses)
 
-install(TARGETS edit DESTINATION lib${SUFFIX}/darling)
+install(TARGETS edit DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/libffi/CMakeLists.txt b/src/libffi/CMakeLists.txt
index 700f63cb1..f970b213b 100644
--- a/src/libffi/CMakeLists.txt
+++ b/src/libffi/CMakeLists.txt
@@ -17,7 +17,7 @@ add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map")
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -35,4 +35,4 @@ set(ffi_SRCS
 add_library(ffi SHARED ${ffi_SRCS})
 target_link_libraries(ffi system)
 
-install(TARGETS ffi DESTINATION lib${SUFFIX}/darling)
+install(TARGETS ffi DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/libgcc/CMakeLists.txt b/src/libgcc/CMakeLists.txt
index 9a3de54b5..87c895119 100644
--- a/src/libgcc/CMakeLists.txt
+++ b/src/libgcc/CMakeLists.txt
@@ -13,11 +13,11 @@ set(libgcc_sources
 	dummy.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(gcc_s SHARED ${libgcc_sources})
 target_link_libraries(gcc_s compiler_rt)
 
-install(TARGETS gcc_s DESTINATION lib${SUFFIX}/darling)
+install(TARGETS gcc_s DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/libiconv/CMakeLists.txt b/src/libiconv/CMakeLists.txt
index ec5ccb15a..36fc992be 100644
--- a/src/libiconv/CMakeLists.txt
+++ b/src/libiconv/CMakeLists.txt
@@ -23,7 +23,7 @@ add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w -include ${CMAKE_CURRENT_BINARY_DIR}/include.h -O0 -ggdb")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map")
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -68,5 +68,5 @@ add_library(iconv SHARED ${iconv_SRCS}
 )
 target_link_libraries(iconv system)
 
-install(TARGETS iconv DESTINATION lib${SUFFIX}/darling)
-install(FILES charset.alias DESTINATION lib${SUFFIX}/darling)
+install(TARGETS iconv DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+install(FILES charset.alias DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/libinfo/CMakeLists.txt b/src/libinfo/CMakeLists.txt
index 8a77714fe..213ada3b6 100644
--- a/src/libinfo/CMakeLists.txt
+++ b/src/libinfo/CMakeLists.txt
@@ -29,7 +29,7 @@ add_subdirectory(lookup.subproj)
 add_subdirectory(membership.subproj)
 add_subdirectory(darling-resolver)
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -44,4 +44,4 @@ add_library(system_info SHARED $<TARGET_OBJECTS:info-util>
 )
 target_link_libraries(system_info system_c resolv-darwin)
 
-install(TARGETS system_info DESTINATION lib${SUFFIX}/darling)
+install(TARGETS system_info DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/libm/CMakeLists.txt b/src/libm/CMakeLists.txt
index 2e87a1c8c..24f833ccc 100644
--- a/src/libm/CMakeLists.txt
+++ b/src/libm/CMakeLists.txt
@@ -141,7 +141,7 @@ set(libm_sources
 
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -150,5 +150,5 @@ set_target_properties(system_m_extra PROPERTIES COMPILE_FLAGS "-UBUILDING_FOR_CA
 
 add_library(system_m SHARED ${libm_sources} $<TARGET_OBJECTS:system_m_extra>)
 
-install(TARGETS system_m DESTINATION lib${SUFFIX}/darling)
+install(TARGETS system_m DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
diff --git a/src/libmach-o/CMakeLists.txt b/src/libmach-o/CMakeLists.txt
index 960591c32..bee77cfec 100644
--- a/src/libmach-o/CMakeLists.txt
+++ b/src/libmach-o/CMakeLists.txt
@@ -25,5 +25,5 @@ set_target_properties(mach-o PROPERTIES VERSION 1.0.0 SOVERSION 1.0)
 set_target_properties(mach-o PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
 target_link_libraries(mach-o -ldl -lpthread darling-util)
 
-install(TARGETS mach-o DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS mach-o DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/libmalloc/CMakeLists.txt b/src/libmalloc/CMakeLists.txt
index b01d87d77..d7b0345f1 100644
--- a/src/libmalloc/CMakeLists.txt
+++ b/src/libmalloc/CMakeLists.txt
@@ -32,11 +32,11 @@ set(libmalloc_sources
 	src/stack_logging_disk.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(system_malloc SHARED ${libmalloc_sources})
 
-install(TARGETS system_malloc DESTINATION lib${SUFFIX}/darling)
+install(TARGETS system_malloc DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
diff --git a/src/libnotify/CMakeLists.txt b/src/libnotify/CMakeLists.txt
index 58575c79d..3923e62cb 100644
--- a/src/libnotify/CMakeLists.txt
+++ b/src/libnotify/CMakeLists.txt
@@ -22,12 +22,12 @@ set(notify_sources
 	${CMAKE_CURRENT_BINARY_DIR}/notify_ipcUser.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(system_notify SHARED ${notify_sources})
 target_link_libraries(system_notify system_c system_kernel)
 
-install(TARGETS system_notify DESTINATION lib${SUFFIX}/darling)
+install(TARGETS system_notify DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
diff --git a/src/libremovefile/CMakeLists.txt b/src/libremovefile/CMakeLists.txt
index 96219fb98..0c77043c9 100644
--- a/src/libremovefile/CMakeLists.txt
+++ b/src/libremovefile/CMakeLists.txt
@@ -17,12 +17,12 @@ set(removefile_sources
 	removefile_tree_walker.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(removefile SHARED ${removefile_sources})
 target_link_libraries(removefile system_c system_kernel)
 
-install(TARGETS removefile DESTINATION lib${SUFFIX}/darling)
+install(TARGETS removefile DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
diff --git a/src/libresolv/CMakeLists.txt b/src/libresolv/CMakeLists.txt
index c883dc9e3..10e8bbab3 100644
--- a/src/libresolv/CMakeLists.txt
+++ b/src/libresolv/CMakeLists.txt
@@ -44,12 +44,12 @@ set(resolv_sources
 	dnsinfo/dnsinfo.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(resolv-darwin SHARED ${resolv_sources})
 target_link_libraries(resolv-darwin system_c system_kernel)
 
-install(TARGETS resolv-darwin DESTINATION lib${SUFFIX}/darling)
+install(TARGETS resolv-darwin DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
diff --git a/src/libstdcxx/CMakeLists.txt b/src/libstdcxx/CMakeLists.txt
index 5ef4701f3..7e9d46786 100644
--- a/src/libstdcxx/CMakeLists.txt
+++ b/src/libstdcxx/CMakeLists.txt
@@ -92,12 +92,12 @@ set(libstdcxx_sources
 	src/dso_handle.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(stdcxx SHARED ${libstdcxx_sources})
 target_link_libraries(stdcxx cxxabi_shared)
 
-install(TARGETS stdcxx DESTINATION lib${SUFFIX}/darling)
+install(TARGETS stdcxx DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
diff --git a/src/libsystem/CMakeLists.txt b/src/libsystem/CMakeLists.txt
index d4ddfbb2b..9ab92aaa6 100644
--- a/src/libsystem/CMakeLists.txt
+++ b/src/libsystem/CMakeLists.txt
@@ -32,7 +32,7 @@ set(libsystem_sources
 	libmacho/arch.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -42,5 +42,5 @@ target_link_libraries(system PUBLIC system_malloc system_c system_kernel keymgr
 	system_m system_info system_notify libdispatch_shared objc launch
 	removefile system_copyfile unwind system_coreservices CommonCrypto)
 
-install(TARGETS system DESTINATION lib${SUFFIX}/darling)
+install(TARGETS system DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
diff --git a/src/libsystem_coreservices/CMakeLists.txt b/src/libsystem_coreservices/CMakeLists.txt
index 9a208a8e4..6d5087a2b 100644
--- a/src/libsystem_coreservices/CMakeLists.txt
+++ b/src/libsystem_coreservices/CMakeLists.txt
@@ -17,11 +17,11 @@ add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--unresolved-symbols=ignore-all -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map")
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(system_coreservices SHARED dirhelper.c NSSystemDirectories.c)
 target_link_libraries(system_coreservices PRIVATE system_c)
 
-install(TARGETS system_coreservices DESTINATION lib${SUFFIX}/darling)
+install(TARGETS system_coreservices DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/libunwind/CMakeLists.txt b/src/libunwind/CMakeLists.txt
index 5fd27ffb6..5a85afb8b 100644
--- a/src/libunwind/CMakeLists.txt
+++ b/src/libunwind/CMakeLists.txt
@@ -32,7 +32,7 @@ set(libunwind_sources
 	src/Unwind-sjlj.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
@@ -40,4 +40,4 @@ add_library(unwind SHARED ${libunwind_sources})
 target_link_libraries(unwind system_c)
 set_target_properties(unwind PROPERTIES LINKER_LANGUAGE C)
 
-install(TARGETS unwind DESTINATION lib${SUFFIX}/darling)
+install(TARGETS unwind DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/libutil/CMakeLists.txt b/src/libutil/CMakeLists.txt
index c06e1928e..d6c51fe0f 100644
--- a/src/libutil/CMakeLists.txt
+++ b/src/libutil/CMakeLists.txt
@@ -26,11 +26,11 @@ set(util_SRCS
 	wipefs.cpp
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(util SHARED ${util_SRCS})
 target_link_libraries(util system)
 
-install(TARGETS util DESTINATION lib${SUFFIX}/darling)
+install(TARGETS util DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/motool/CMakeLists.txt b/src/motool/CMakeLists.txt
index 90c8e2834..56c3af3f1 100644
--- a/src/motool/CMakeLists.txt
+++ b/src/motool/CMakeLists.txt
@@ -14,7 +14,7 @@ set(motool_SRCS
 	motool.cpp
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/src/ncurses/menu/CMakeLists.txt b/src/ncurses/menu/CMakeLists.txt
index f97a37fdd..e1b2b018f 100644
--- a/src/ncurses/menu/CMakeLists.txt
+++ b/src/ncurses/menu/CMakeLists.txt
@@ -37,11 +37,11 @@ set(menu_sources
 	m_win.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(menu SHARED ${menu_sources})
 target_link_libraries(menu system)
 
-install(TARGETS menu DESTINATION lib${SUFFIX}/darling)
+install(TARGETS menu DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/ncurses/ncurses/CMakeLists.txt b/src/ncurses/ncurses/CMakeLists.txt
index 39402941f..029feb7fe 100644
--- a/src/ncurses/ncurses/CMakeLists.txt
+++ b/src/ncurses/ncurses/CMakeLists.txt
@@ -189,11 +189,11 @@ set(ncurses_sources
 	base/fallback.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(ncurses SHARED ${ncurses_sources})
 target_link_libraries(ncurses system)
 
-install(TARGETS ncurses DESTINATION lib${SUFFIX}/darling)
+install(TARGETS ncurses DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/ncurses/panel/CMakeLists.txt b/src/ncurses/panel/CMakeLists.txt
index 44e9a8cfd..505218da9 100644
--- a/src/ncurses/panel/CMakeLists.txt
+++ b/src/ncurses/panel/CMakeLists.txt
@@ -23,11 +23,11 @@ set(panel_sources
 	p_win.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(panel SHARED ${panel_sources})
 target_link_libraries(panel system)
 
-install(TARGETS panel DESTINATION lib${SUFFIX}/darling)
+install(TARGETS panel DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
diff --git a/src/thin/CMakeLists.txt b/src/thin/CMakeLists.txt
index f7d8080c3..a15a2eb38 100644
--- a/src/thin/CMakeLists.txt
+++ b/src/thin/CMakeLists.txt
@@ -5,7 +5,7 @@ if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -17,5 +17,5 @@ SET_TARGET_PROPERTIES(AppKit PROPERTIES LINKER_LANGUAGE C)
 add_library(auto SHARED)
 SET_TARGET_PROPERTIES(auto PROPERTIES LINKER_LANGUAGE C)
 
-install(TARGETS AppKit auto DESTINATION "lib${SUFFIX}/darling")
+install(TARGETS AppKit auto DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling")
 
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index c2cd3b5ac..2065a84b4 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -15,12 +15,12 @@ set(util-SRCS
 	leb.cpp
 )
 
-#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
 #SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 #SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(darling-util ${util-SRCS})
 set_target_properties(darling-util PROPERTIES COMPILE_FLAGS "-fPIC")
-#install(TARGETS darling-util DESTINATION lib${SUFFIX}/darling)
+#install(TARGETS darling-util DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
 
diff --git a/src/xar/CMakeLists.txt b/src/xar/CMakeLists.txt
index 2b6e8588a..f8d2ae90b 100644
--- a/src/xar/CMakeLists.txt
+++ b/src/xar/CMakeLists.txt
@@ -46,11 +46,11 @@ set(xar_SRCS
 	lib/zxar.c
 )
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_library(xar SHARED ${xar_SRCS})
 target_link_libraries(xar system z bz2 xml2 ssl098 crypto098)
 
-install(TARGETS xar DESTINATION lib${SUFFIX}/darling)
+install(TARGETS xar DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)