diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoToolSystem.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoToolSystem.java
index 669dd360b65..7fa5b1b20f0 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoToolSystem.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoToolSystem.java
@@ -60,9 +60,21 @@ public class ArduinoToolSystem {
 		case Platform.OS_LINUX:
 			switch (Platform.getOSArch()) {
 			case Platform.ARCH_X86_64:
-				return "x86_64-pc-linux-gnu".equals(host); //$NON-NLS-1$
+				switch (host) {
+				case "x86_64-pc-linux-gnu": //$NON-NLS-1$
+				case "x86_64-linux-gnu": //$NON-NLS-1$
+					return true;
+				default:
+					return false;
+				}
 			case Platform.ARCH_X86:
-				return "i686-pc-linux-gnu".equals(host); //$NON-NLS-1$
+				switch (host) {
+				case "i686-pc-linux-gnu": //$NON-NLS-1$
+				case "i686-linux-gnu": //$NON-NLS-1$
+					return true;
+				default:
+					return false;
+				}
 			default:
 				return false;
 			}