diff --git a/MAINTAINERS b/MAINTAINERS
index 23a61d9d0e78c3bfa278ec2739238f542dfaf81c..63008663f4ad36fe949ef7e17a912dbe00275922 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3885,6 +3885,15 @@ S:	Maintained
 F:	Documentation/i2c/busses/i2c-ocores
 F:	drivers/i2c/busses/i2c-ocores.c
 
+OPEN FIRMWARE AND FLATTENED DEVICE TREE
+M:	Grant Likely <grant.likely@secretlab.ca>
+L:	devicetree-discuss@lists.ozlabs.org
+W:	http://fdt.secretlab.ca
+S:	Maintained
+F:	drivers/of
+F:	include/linux/of*.h
+K:	of_get_property
+
 OPROFILE
 M:	Robert Richter <robert.richter@amd.com>
 L:	oprofile-list@lists.sf.net