diff --git a/configure b/configure
index 539af842bd..ec76453e37 100755
--- a/configure
+++ b/configure
@@ -823,7 +823,7 @@ else
 			get_build_tool_path STRIP_$targetArch ${crossToolsPrefix}strip
 
 			case `get_variable HAIKU_GCC_RAW_VERSION_$targetArch` in
-				4.*|5.*|6.*|7.*)
+				4.*|5.*|6.*|7.*|8.*)
 					get_build_tool_path ELFEDIT_$targetArch \
 						${crossToolsPrefix}elfedit
 				;;
diff --git a/headers/build/os/BeBuild.h b/headers/build/os/BeBuild.h
index 8d349beaf2..40ed4798f3 100644
--- a/headers/build/os/BeBuild.h
+++ b/headers/build/os/BeBuild.h
@@ -37,7 +37,7 @@
 
 #if __GNUC__ == 2
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_2_HAIKU
-#elif __GNUC__ >= 3 && __GNUC__ <= 7
+#elif __GNUC__ >= 3 && __GNUC__ <= 8
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_4
 #else
 #	error Unsupported gcc version!
diff --git a/headers/os/BeBuild.h b/headers/os/BeBuild.h
index 850c794e95..30dd21a065 100644
--- a/headers/os/BeBuild.h
+++ b/headers/os/BeBuild.h
@@ -45,7 +45,7 @@
 
 #if __GNUC__ == 2
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_2_HAIKU
-#elif __GNUC__ >= 4 && __GNUC__ <= 7
+#elif __GNUC__ >= 4 && __GNUC__ <= 8
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_4
 #else
 #	error Unsupported gcc version!