diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoLibrary.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoLibrary.java
index 6c90c0062d5..9c77d69996d 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoLibrary.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoLibrary.java
@@ -193,8 +193,12 @@ public class ArduinoLibrary {
 		if (srcPath.toFile().isDirectory()) {
 			return Collections.singletonList(srcPath);
 		} else {
-			// TODO do I need the 'utility' directory?
-			return Collections.singletonList(installPath);
+			Path utilityPath = installPath.resolve("utility"); //$NON-NLS-1$
+			if (utilityPath.toFile().isDirectory()) {
+				return Arrays.asList(installPath, utilityPath);
+			} else {
+				return Collections.singletonList(installPath);
+			}
 		}
 	}