diff --git a/CMakeLists.txt b/CMakeLists.txt
index f24c4c69c8bc0e33799c86a877fb3166575671b8..3d7233a49f0e77f45b464883652fc297d486b61b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,9 +11,9 @@ cmake_minimum_required( VERSION 3.15)
 # otherwise build of GCC fails.
 
 # Version should be in relation to GCC version number
-project( 
-  gcc_cross_toolchain 
-  VERSION 8.3.0.0
+project(
+  gcc_cross_toolchain
+  VERSION 8.4.0.0
   DESCRIPTION "GCC Cross Toolchain"
   LANGUAGES NONE)
 
diff --git a/build_gcc.cmake b/build_gcc.cmake
index 6887c6cfc75c35353b7949725b7eade5aee55822..1f5554086b2b0470282c0ca7823e15f927e0ad2e 100644
--- a/build_gcc.cmake
+++ b/build_gcc.cmake
@@ -37,8 +37,8 @@ endif( BUILD_MINGW)
 
 ExternalProject_Add(
   gcc
-  URL https://ftp.mpi-inf.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-9.2.0/gcc-9.2.0.tar.xz
-  URL_HASH SHA512=a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
+  URL https://ftp.mpi-inf.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-8.4.0/gcc-8.4.0.tar.xz
+  URL_HASH SHA512=6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
 
   CONFIGURE_COMMAND <SOURCE_DIR>/configure ${GCC_CONFIGURE_ARGS}
   INSTALL_DIR ${OUTPUT_DIR}