diff --git a/docs/usage/customization-guide.md b/docs/usage/customization-guide.md
index 7eaf788fa..773e0dffe 100644
--- a/docs/usage/customization-guide.md
+++ b/docs/usage/customization-guide.md
@@ -306,6 +306,7 @@ The hook stdout and feature files are expected to contain features in simple
 key-value pairs, separated by newlines:
 
 ```plaintext
+# This is a comment
 <name>[=<value>]
 ```
 
@@ -313,6 +314,8 @@ The label value defaults to `true`, if not specified.
 
 Label namespace may be specified with `<namespace>/<name>[=<value>]`.
 
+Comment lines (starting with `#`) are ignored.
+
 ### Mounts
 
 The standard NFD deployments contain `hostPath` mounts for
diff --git a/source/local/local.go b/source/local/local.go
index abb1ad0bb..9d1459572 100644
--- a/source/local/local.go
+++ b/source/local/local.go
@@ -150,6 +150,11 @@ func parseFeatures(lines [][]byte) map[string]string {
 	for _, l := range lines {
 		line := strings.TrimSpace(string(l))
 		if len(line) > 0 {
+			// Skip comment lines
+			if strings.HasPrefix(line, "#") {
+				continue
+			}
+
 			lineSplit := strings.SplitN(line, "=", 2)
 
 			key := lineSplit[0]