diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccf76847..6aaae61a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,10 +47,10 @@ will consitute of a breaking change warranting a new major release:
   recovery handling becomes stuck in the custom recovery sequence when swichting power back on.
 - The dual lane custom recovery handling was adapted to always perform proper power switch handling
   irrespective of current or target modes.
-- The cross compiler binary path now needs to be set explicitely as an environmental variable
-  named `CROSS_COMPILE_BIN_PATH` when setting up the build system. This prevents CMake from
-  selecting wrong cross-compilers. CMake will not seach in the system path for cross-compilers
-  anymore.
+- The CMake build generator will now search for the cross-compiler binaries in the environmental
+  variable named `CROSS_COMPILE_BIN_PATH` first when setting up the build system. This prevents
+  CMake from selecting wrong cross-compilers if multiple cross-compilers with the same name are used
+  on the same system.
 - Compile fix if SCEX is compiled for the EM.
 
 # [v2.0.4] 2023-04-19
diff --git a/cmake/Zynq7020CrossCompileConfig.cmake b/cmake/Zynq7020CrossCompileConfig.cmake
index e6e762ad..5e269f1a 100644
--- a/cmake/Zynq7020CrossCompileConfig.cmake
+++ b/cmake/Zynq7020CrossCompileConfig.cmake
@@ -40,8 +40,8 @@ set(CROSS_COMPILE_OBJCOPY "${CROSS_COMPILE}-objcopy")
 set(CROSS_COMPILE_SIZE "${CROSS_COMPILE}-size")
 
 # At the very least, cross compile gcc and g++ have to be set!
-find_program (CMAKE_C_COMPILER ${CROSS_COMPILE_CC} HINTS $ENV{CROSS_COMPILE_BIN_PATH} NO_DEFAULT_PATH REQUIRED)
-find_program (CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX} HINTS $ENV{CROSS_COMPILE_BIN_PATH} NO_DEFAULT_PATH REQUIRED)
+find_program (CMAKE_C_COMPILER ${CROSS_COMPILE_CC} HINTS $ENV{CROSS_COMPILE_BIN_PATH} REQUIRED)
+find_program (CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX} HINTS $ENV{CROSS_COMPILE_BIN_PATH} REQUIRED)
 # Useful utilities, not strictly necessary
 find_program(CMAKE_SIZE ${CROSS_COMPILE_SIZE})
 find_program(CMAKE_OBJCOPY ${CROSS_COMPILE_OBJCOPY})
diff --git a/q7s-env-em.sh b/q7s-env-em.sh
index 969d9ec0..698b6b23 100755
--- a/q7s-env-em.sh
+++ b/q7s-env-em.sh
@@ -7,7 +7,7 @@
 export CROSS_COMPILE_BIN_PATH="/opt/q7s-gcc/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"
 export ZYNQ_7020_SYSROOT="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"
 
-export PATH=$PATH:${CROSS_COMPILE_BIN_PATH}
+export PATH=${CROSS_COMPILE_BIN_PATH}:$PATH
 export CROSS_COMPILE="arm-linux-gnueabihf"
 export EIVE_Q7S_EM=1
 
diff --git a/q7s-env.sh b/q7s-env.sh
index 4dea9154..4b752e17 100755
--- a/q7s-env.sh
+++ b/q7s-env.sh
@@ -7,7 +7,7 @@
 export CROSS_COMPILE_BIN_PATH="/opt/q7s-gcc/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"
 export ZYNQ_7020_SYSROOT="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"
 
-export PATH=$PATH:${CROSS_COMPILE_BIN_PATH}
+export PATH=${CROSS_COMPILE_BIN_PATH}:$PATH
 export CROSS_COMPILE="arm-linux-gnueabihf"
 # export EIVE_Q7S_EM=1