diff --git a/configure b/configure
index 651098925b..1bedae3b10 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.*)
+				4.*|5.*|6.*)
 					get_build_tool_path ELFEDIT_$targetArch \
 						${crossToolsPrefix}elfedit
 				;;
diff --git a/headers/os/BeBuild.h b/headers/os/BeBuild.h
index 509ccf51e5..6eacecf366 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
+#elif __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_4
 #else
 #	error Unsupported gcc version!
diff --git a/headers/private/kernel/util/AutoLock.h b/headers/private/kernel/util/AutoLock.h
index 3151065857..c081945e88 100644
--- a/headers/private/kernel/util/AutoLock.h
+++ b/headers/private/kernel/util/AutoLock.h
@@ -130,9 +130,9 @@ typedef AutoLocker<spinlock, SpinLocking> SpinLocker;
 
 class InterruptsSpinLocking {
 public:
-// NOTE: work-around for annoying GCC 4 "fState may be used uninitialized"
+// NOTE: work-around for annoying GCC 4+ "fState may be used uninitialized"
 // warning.
-#if __GNUC__ == 4
+#if __GNUC__ >= 4
 	InterruptsSpinLocking()
 		:
 		fState(0)