diff --git a/.travis.yml b/.travis.yml
index 03fc536c2e..a298b25396 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,12 +38,12 @@ matrix:
             - cmake3
             - g++-mingw-w64-x86-64
     - os: linux
-      env: PROFILE=armsf,armtrusty
+      env: PROFILE=armhf,armtrusty
       addons:
         apt:
           packages:
             - cmake3
-            - g++-arm-linux-gnueabi
+            - g++-arm-linux-gnueabihf
     - os: linux
       env: PROFILE=aarch64
       addons:
diff --git a/toolchain/Armhf.cmake b/toolchain/Armhf.cmake
index c40392a9fa..81f091996c 100644
--- a/toolchain/Armhf.cmake
+++ b/toolchain/Armhf.cmake
@@ -7,9 +7,9 @@ if(NOT SKIP_COMPILER_VERSION)
 	endif()
 endif()
 SET(TOOLCHAIN_SUFFIX hf)
-SET(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc${COMPILER_VERSION})
-SET(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++${COMPILER_VERSION})
-SET(CMAKE_STRIP ${TOOLCHAIN_PREFIX}-strip CACHE FILEPATH "" FORCE)
+SET(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-gcc${COMPILER_VERSION})
+SET(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-g++${COMPILER_VERSION})
+SET(CMAKE_STRIP ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-strip CACHE FILEPATH "" FORCE)
 SET(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}/)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
diff --git a/toolchain/Armsf.cmake b/toolchain/Armsf.cmake
index 70aa062a4d..b74dc95716 100644
--- a/toolchain/Armsf.cmake
+++ b/toolchain/Armsf.cmake
@@ -7,9 +7,9 @@ if(NOT SKIP_COMPILER_VERSION)
 	endif()
 endif()
 SET(TOOLCHAIN_SUFFIX "")
-SET(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc${COMPILER_VERSION})
-SET(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++${COMPILER_VERSION})
-SET(CMAKE_STRIP ${TOOLCHAIN_PREFIX}-strip CACHE FILEPATH "" FORCE)
+SET(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-gcc${COMPILER_VERSION})
+SET(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-g++${COMPILER_VERSION})
+SET(CMAKE_STRIP ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-strip CACHE FILEPATH "" FORCE)
 SET(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}/)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)