diff --git a/README.md b/README.md
index b3b5e60b..ef1dd842 100644
--- a/README.md
+++ b/README.md
@@ -28,5 +28,5 @@ Dynamic additional dependencies:
 - [Guidelines for submitting patches](documentation/submitting_patches.md)
 - [Reporting bugs](documentation/reporting_bugs.md)
 - [Reporting security bugs](SECURITY.md)
-- [Maintainers](MAINTAINERS)
+- [Maintainers](documentation/MAINTAINERS.md)
 
diff --git a/MAINTAINERS b/documentation/MAINTAINERS.md
similarity index 70%
rename from MAINTAINERS
rename to documentation/MAINTAINERS.md
index 73a9fe3a..ea435849 100644
--- a/MAINTAINERS
+++ b/documentation/MAINTAINERS.md
@@ -1,15 +1,13 @@
-This file contains a list of BSP maintainers for the BSPs contained in
-the meta-intel repository.
-
 The purpose of this file is to provide contact information for
-specific BSPs and other code contained within meta-intel.  You should
+specific BSPs and other code contained within meta-intel. You should
 address questions and patches for a particular BSP or other code to
 the appropriate maintainer listed in this file, cc'ing the meta-intel
-mailing list.  This ensures that your question or patch will be
+mailing list. This ensures that your question or patch will be
 addressed by the appropriate person, and that it will be seen by other
 users who may be facing similar problems or questions.
 
-Please see the top-level README file for guidelines relating to the
+Please see the [Guidelines for submitting patches](submitting_patches.md)
+and [Reporting bugs](reporting_bugs.md) guidelines relating to the
 details of submitting patches, reporting problems, or asking questions
 about any of the BSPs or other recipes contained within meta-intel.
 
@@ -26,7 +24,5 @@ Please keep this list in alphabetical order.
 
 Maintainers List (try to look for most precise areas first)
 
-		-----------------------------------
-
-M:	Anuj Mittal <anuj.mittal@intel.com>
-F:	*
+M: Anuj Mittal <anuj.mittal@intel.com>
+F: *
diff --git a/documentation/reporting_bugs.md b/documentation/reporting_bugs.md
index 04a4d47f..59621c1e 100644
--- a/documentation/reporting_bugs.md
+++ b/documentation/reporting_bugs.md
@@ -1,7 +1,7 @@
 ## Reporting bugs
 
 If you have problems with or questions about a particular BSP, please
-contact the maintainer listed in the [Maintainer](MAINTAINERS) file directly (cc:ing
+contact the maintainer listed in the [Maintainers](MAINTAINERS.md) file directly (cc:ing
 the Yocto mailing list puts it in the archive and helps other people
 who might have the same questions in the future), but please try to do
 the following first: