diff --git a/CHANGELOG b/CHANGELOG
index c50ff0e002fd4f52c5a1080e910cdf3433543bb4..8e1c3022047d73dd45ef29bcc569439dc9938438 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,7 +9,8 @@ BornAgain-1.20?
     * Support soft-matter reflectometry parameterization files of Anaklasis
     * Remove FormFactorDot to avoid its inherent inconsistencies (use small sphere instead)
     * Remove unused/undocumented functions Layer::setThickness, setMaterial
-  > GUI changes:
+> GUI changes:
+    * Executable renamed to bornagain, except under Windows, where it is still BornAgain
     * Support "*.001" files generated by Nicos at SANS-1 of MLZ / FRM2
     * Improved file chooser for 2d data import
   > Bug fixes:
diff --git a/Doc/man/CMakeLists.txt b/Doc/man/CMakeLists.txt
index 269712444d001e9a22158b3ffc8b0c84c4034032..91786752a73fb2b62a9ea6ecf0ce837d020e0949 100644
--- a/Doc/man/CMakeLists.txt
+++ b/Doc/man/CMakeLists.txt
@@ -8,7 +8,8 @@ add_custom_target(
 
 add_custom_command(
     OUTPUT ${AUTO_DIR}/bornagain.1
-    COMMAND ${POD2MAN} -s 1 -c "BornAgain manual" ${CMAKE_CURRENT_SOURCE_DIR}/bornagain.pod ${AUTO_DIR}/bornagain.1
+    COMMAND ${POD2MAN} -s 1 -c "BornAgain manual"
+            ${CMAKE_CURRENT_SOURCE_DIR}/bornagain.pod ${AUTO_DIR}/bornagain.1
     DEPENDS bornagain.pod
 )
 
diff --git a/GUI/main/CMakeLists.txt b/GUI/main/CMakeLists.txt
index ccf31a9765ee04439149bf785b5a5000e6ec3cdd..e67975ba94dd7b3ccb5a9bff1909241bff785607 100644
--- a/GUI/main/CMakeLists.txt
+++ b/GUI/main/CMakeLists.txt
@@ -1,7 +1,12 @@
 ###############################################################################
 # Builds BornAgain/GUI main executable
 ###############################################################################
-set(executable_name BornAgain)
+
+if(WIN32)
+    set(executable_name BornAgain)
+else()
+    set(executable_name bornagain)
+endif()
 
 set(source_files main.cpp appoptions.cpp MessageHandler.cpp)
 set(include_files appoptions.h MessageHandler.h )
diff --git a/cmake/BornAgain/Linux.cmake b/cmake/BornAgain/Linux.cmake
index 2f482eea00075e9c0b7430db478bb8cd8b962ea3..98f67a52193f6681ac28d719ba370ca88ca1e183 100644
--- a/cmake/BornAgain/Linux.cmake
+++ b/cmake/BornAgain/Linux.cmake
@@ -1,14 +1,13 @@
 set(BORNAGAIN_ARCHITECTURE linux)
 set(BORNAGAIN_PLATFORM linux)
 
-execute_process(COMMAND uname -m OUTPUT_VARIABLE SYSCTL_OUTPUT)
-if(${SYSCTL_OUTPUT} MATCHES x86_64)
+if(CMAKE_SIZEOF_VOID_P GREATER 4)
     message(STATUS "Found a 64bit system")
-    set(BIT_ENVIRONMENT "-m64")
-    set(BORNAGAIN_ARCHITECTURE linuxx8664)
+    if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
+        set(BORNAGAIN_ARCHITECTURE linuxx8664)
+    endif()
 else()
     message(STATUS "Found a 32bit system")
-    set(BIT_ENVIRONMENT "-m32")
     add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY=1)
 endif()