diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index eb2bc24ac..9314a7a85 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -304,27 +304,66 @@ MACRO(NL_SETUP_BUILD)
     ENDIF(CMAKE_BUILD_TYPE MATCHES "Release")
   ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug")
 
-  # Determine target CPU
-#  IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
-    IF(NOT CMAKE_SIZEOF_VOID_P)
-      INCLUDE (CheckTypeSize)
-      CHECK_TYPE_SIZE("void*"  CMAKE_SIZEOF_VOID_P)
-    ENDIF(NOT CMAKE_SIZEOF_VOID_P)
+  SET(HOST_CPU ${CMAKE_SYSTEM_PROCESSOR})
 
-    # Using 32 or 64 bits libraries
+  # Determine target CPU
+  IF(NOT TARGET_CPU)
+    SET(TARGET_CPU $ENV{DEB_HOST_GNU_CPU})
+  ENDIF(NOT TARGET_CPU)
+
+  # If not specified, use the same CPU as host
+  IF(NOT TARGET_CPU)
+    SET(TARGET_CPU ${CMAKE_SYSTEM_PROCESSOR})
+  ENDIF(NOT TARGET_CPU)
+
+  IF(TARGET_CPU MATCHES "amd64")
+    SET(TARGET_CPU "x86_64")
+  ELSEIF(TARGET_CPU MATCHES "i.86")
+    SET(TARGET_CPU "x86")
+  ENDIF(TARGET_CPU MATCHES "amd64")
+
+  # DEB_HOST_ARCH_ENDIAN is 'little' or 'big'
+  # DEB_HOST_ARCH_BITS is '32' or '64'
+
+  # If target and host CPU are the same
+  IF("${HOST_CPU}" STREQUAL "${TARGET_CPU}")
+    # x86-compatible CPU
+    IF(HOST_CPU MATCHES "x86")
+      IF(NOT CMAKE_SIZEOF_VOID_P)
+        INCLUDE (CheckTypeSize)
+        CHECK_TYPE_SIZE("void*"  CMAKE_SIZEOF_VOID_P)
+      ENDIF(NOT CMAKE_SIZEOF_VOID_P)
+
+      # Using 32 or 64 bits libraries
+      IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        SET(TARGET_CPU "x86_64")
+      ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        SET(TARGET_CPU "x86")
+      ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    ENDIF(HOST_CPU MATCHES "x86")
+    # TODO: add checks for ARM and PPC
+  ELSE("${HOST_CPU}" STREQUAL "${TARGET_CPU}")
+    MESSAGE(STATUS "Compiling on ${HOST_CPU} for ${TARGET_CPU}")
+  ENDIF("${HOST_CPU}" STREQUAL "${TARGET_CPU}")
+
+  IF(TARGET_CPU STREQUAL "x86_64")
+    SET(TARGET_X64 1)
+    SET(PLATFORM_CFLAGS "-DHAVE_X86_64")
+  ELSEIF(TARGET_CPU STREQUAL "x86")
     SET(TARGET_X86 1)
-    IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      SET(ARCH "x86_64")
-      SET(TARGET_X64 1)
-      ADD_DEFINITIONS(-DHAVE_X86_64)
-    ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      SET(ARCH "x86")
-      ADD_DEFINITIONS(-DHAVE_X86)
-    ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-#     ADD_DEFINITIONS(-DHAVE_IA64)
-#  ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
+    SET(PLATFORM_CFLAGS "-DHAVE_X86")
+  ENDIF(TARGET_CPU STREQUAL "x86_64")
 
-  IF(WIN32)
+  # Fix library paths suffixes for Debian MultiArch
+  IF(NOT CMAKE_LIBRARY_ARCHITECTURE)
+    SET(CMAKE_LIBRARY_ARCHITECTURE $ENV{DEB_HOST_MULTIARCH})
+  ENDIF(NOT CMAKE_LIBRARY_ARCHITECTURE)
+
+  IF(CMAKE_LIBRARY_ARCHITECTURE)
+    SET(CMAKE_LIBRARY_PATH "/lib/${CMAKE_LIBRARY_ARCHITECTURE};/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE};${CMAKE_LIBRARY_PATH}")
+  ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
+
+  IF(MSVC)
     IF(MSVC10)
       # /Ox is working with VC++ 2010, but custom optimizations don't exist
       SET(SPEED_OPTIMIZATIONS "/Ox /GF /GS-")
@@ -367,7 +406,16 @@ MACRO(NL_SETUP_BUILD)
     SET(NL_DEBUG_LINKFLAGS "/NODEFAULTLIB:msvcrt /INCREMENTAL:YES")
     SET(NL_RELEASE_LINKFLAGS "/OPT:REF /OPT:ICF /INCREMENTAL:NO")
   ELSE(WIN32)
-    SET(PLATFORM_CFLAGS "-g -pipe -ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-unused -fno-strict-aliasing")
+    IF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
+      SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -m32 -march=i686")
+    ENDIF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
+
+    IF(HOST_CPU STREQUAL "x86" AND TARGET_CPU STREQUAL "x86_64")
+      SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -m64")
+    ENDIF(HOST_CPU STREQUAL "x86" AND TARGET_CPU STREQUAL "x86_64")
+
+    SET(PLATFORM_CFLAGS "{PLATFORM_CFLAGS} -g -D_REENTRANT -pipe -ftemplate-depth-48 -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-unused -fno-strict-aliasing")
+
     IF(WITH_COVERAGE)
       SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
     ENDIF(WITH_COVERAGE)
@@ -384,7 +432,7 @@ MACRO(NL_SETUP_BUILD)
     SET(PLATFORM_CXXFLAGS ${PLATFORM_CFLAGS})
 
     IF(NOT APPLE)
-      SET(PLATFORM_LINKFLAGS "-Wl,--no-undefined -Wl,--as-needed")
+      SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--no-undefined -Wl,--as-needed")
     ENDIF(NOT APPLE)
 
     SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -D_DEBUG")
@@ -453,7 +501,11 @@ MACRO(NL_SETUP_PREFIX_PATHS)
     IF(WIN32)
       SET(NL_LIB_PREFIX "../lib" CACHE PATH "Installation path for libraries.")
     ELSE(WIN32)
-      SET(NL_LIB_PREFIX "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation path for libraries.")
+      IF(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_LIB_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
+      ELSE(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_LIB_PREFIX "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation path for libraries.")
+      ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
     ENDIF(WIN32)
   ENDIF(NOT NL_LIB_PREFIX)
 
@@ -462,7 +514,11 @@ MACRO(NL_SETUP_PREFIX_PATHS)
     IF(WIN32)
       SET(NL_DRIVER_PREFIX "../lib" CACHE PATH "Installation path for drivers.")
     ELSE(WIN32)
-      SET(NL_DRIVER_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/nel" CACHE PATH "Installation path for drivers.")
+      IF(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_DRIVER_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/nel" CACHE PATH "Installation path for drivers.")
+      ELSE(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_DRIVER_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/nel" CACHE PATH "Installation path for drivers.")
+      ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
     ENDIF(WIN32)
   ENDIF(NOT NL_DRIVER_PREFIX)