diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8872da8..7e9ce4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@
 project(MentOs)
 cmake_minimum_required(VERSION 2.8.4)
 
+message(STATUS "Crosscompiling: ${CMAKE_CROSSCOMPILING}")
+
 # ------------------------------------------------------------------------------
 # Add operating system specific option.
 message(STATUS "System name: ${CMAKE_HOST_SYSTEM_NAME}")
diff --git a/mentos/CMakeLists.txt b/mentos/CMakeLists.txt
index 7080784..dc9257e 100644
--- a/mentos/CMakeLists.txt
+++ b/mentos/CMakeLists.txt
@@ -1,16 +1,16 @@
 # ------------------------------------------------------------------------------
 # Initialize the project.
-project(MentOs C ASM ASM_NASM)
+project(MentOs C ASM)
 set(PROJECT_NAME MentOs)
 
 # ------------------------------------------------------------------------------
 # Add operating system specific option.
 if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE) # Apple MacOSx
-    set(CMAKE_ASM_NASM_COMPILER nasm)
+    set(CMAKE_ASM_COMPILER nasm)
 elseif ((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") OR WIN32) # Windows
-    set(CMAKE_ASM_NASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm)
+    set(CMAKE_ASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm)
 else () # Generic Unix System
-    set(CMAKE_ASM_NASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm)
+    set(CMAKE_ASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm)
 endif ()
 
 # ------------------------------------------------------------------------------
@@ -144,11 +144,11 @@ endif (CMAKE_BUILD_TYPE MATCHES "Release")
 
 # ------------------------------------------------------------------------------
 # Set the assembly flags.
-set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -g")
-set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -O0")
-set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -f elf")
-set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -F dwarf")
-set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <FLAGS> <SOURCE> -o <OBJECT>")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -g")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -O0")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -f elf")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -F dwarf")
+set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <FLAGS> <SOURCE> -o <OBJECT>")
 
 # ------------------------------------------------------------------------------
 # Add the includes.
diff --git a/toolchain.cmake b/toolchain.cmake
index b6ed6a7..294635c 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -1,17 +1,5 @@
 set(CMAKE_SYSTEM_NAME Generic)
 
-message(STATUS "Cross compiling")
-
-# ------------------------------------------------------------------------------
-# Add operating system specific option.
-if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE) # Apple MacOSx
-    set(CMAKE_ASM_NASM_COMPILER nasm)
-elseif ((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") OR WIN32) # Windows
-    set(CMAKE_ASM_NASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm)
-else () # Generic Unix System
-    set(CMAKE_ASM_NASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm)
-endif ()
-
 if(CMAKE_VERSION VERSION_LESS "3.6.0")
     INCLUDE(CMakeForceCompiler)
     CMAKE_FORCE_C_COMPILER(i386-elf-gcc Clang)