diff --git a/LICENSE b/LICENSE
index 4dc9a312343..a7aac9b3d15 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,14 +1,4 @@
-Different components of Poky are under different licenses (a mix of 
-MIT and GPLv2). Please see:
-
-bitbake/COPYING (GPLv2)
-meta/COPYING.MIT (MIT)
-meta-extras/COPYING.MIT (MIT)
-
-which cover the components in those subdirectories. This means all 
-metadata is MIT licensed unless otherwise stated. Source code included 
-in tree for individual recipes is under the LICENSE stated in the .bb 
+All metadata is MIT licensed (see LICENSE.MIT) unless otherwise stated. Source code
+included in tree for individual recipes is under the LICENSE stated in the .bb
 file for those software projects unless otherwise stated.
 
-License information for any other files is either explicitly stated 
-or defaults to GPL version 2.
diff --git a/LICENSE.MIT b/LICENSE.MIT
new file mode 100644
index 00000000000..a6919eb7e1f
--- /dev/null
+++ b/LICENSE.MIT
@@ -0,0 +1,25 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Note:
+Individual files contain the following tag instead of the full license text.
+
+    SPDX-License-Identifier: MIT
+
+This enables machine processing of license information based on the SPDX
+License Identifiers that are here available: http://spdx.org/licenses/
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
index 7af3e1dac76..f116d57362b 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
+++ b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2014 Intel Corporation
 #
-# Released under the MIT license (see COPYING.MIT)
-
+# SPDX-License-Identifier: MIT
+#
 # This module adds support to testimage.bbclass to deploy images and run
 # tests on a BeagleBone (original "white" or Black models). The device must
 # be set up as per README.hardware and the master image should be deployed
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py b/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
index c3a98979c56..355d414c524 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
+++ b/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2014 Intel Corporation
 #
-# Released under the MIT license (see COPYING.MIT)
+# SPDX-License-Identifier: MIT
 
 # This module adds support to testimage.bbclass to deploy images and run
 # tests on a Generic PC that boots using grub bootloader. The device must