diff --git a/ChangeLog b/ChangeLog
index 1cd31839d..a2f128ece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-25	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* cmake/modules/DetectMachine.cmake:
+	allow specifying destination directory for libs via CMAKE_INSTALL_LIBDIR
+
 	* src/core/sample_buffer.cpp:
 	- fixed out-of-boundary array access when reversing samples
 	- optimized loops for loading samples
diff --git a/cmake/modules/DetectMachine.cmake b/cmake/modules/DetectMachine.cmake
index 7ac539d21..decda4466 100644
--- a/cmake/modules/DetectMachine.cmake
+++ b/cmake/modules/DetectMachine.cmake
@@ -26,11 +26,16 @@ ELSE(${Machine} MATCHES "i686" OR ${Machine} MATCHES "i386" )
 	ENDIF(${Machine} MATCHES "x86_64")
 ENDIF(${Machine} MATCHES "i686" OR ${Machine} MATCHES "i386" )
 
-IF(LMMS_HOST_X86_64)
-	SET(LIB_DIR lib64)
-ELSE(LMMS_HOST_X86_64)
-	SET(LIB_DIR lib)
-ENDIF(LMMS_HOST_X86_64)
+IF(CMAKE_INSTALL_LIBDIR)
+	SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
+ELSE(CMAKE_INSTALL_LIBDIR)
+	IF(LMMS_HOST_X86_64)
+		SET(LIB_DIR lib64)
+	ELSE(LMMS_HOST_X86_64)
+		SET(LIB_DIR lib)
+	ENDIF(LMMS_HOST_X86_64)
+ENDIF(CMAKE_INSTALL_LIBDIR)
+
 
 IF(LMMS_BUILD_WIN32)
 	SET(PLUGIN_DIR plugins)