diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index f681214aa5..ecdbabbd25 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -1248,20 +1248,21 @@
      Getting branches from remote repo git://git.yoctoproject.org/linux-yocto-3.10.git...
      Please choose a machine branch to base your new BSP branch on: [default: standard/base]
 	     1) standard/arm-versatile-926ejs
-	     2) standard/base
-	     3) standard/beagleboard
+             2) standard/base
+	     3) standard/beaglebone
 	     4) standard/ck
 	     5) standard/crownbay
 	     6) standard/edf
 	     7) standard/emenlow
 	     8) standard/fri2
 	     9) standard/fsl-mpc8315e-rdb
-	     10) standard/minnow
+	     10) standard/ltsi
 	     11) standard/mti-malta32
 	     12) standard/mti-malta64
-	     13) standard/qemuppc
-	     14) standard/routerstationpro
-	     15) standard/sys940x
+	     13) standard/ocf
+	     14) standard/qemuppc
+	     15) standard/edgerouter
+	     16) standard/sys940x
      1
      Would you like SMP support? (y/n) [default: y]
      Does your BSP have a touchscreen? (y/n) [default: n]
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 27e52839c0..528c9b71ea 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -5072,7 +5072,7 @@
                         <literallayout class='monospaced'>
      src/gz all http://www.mysite.com/BOARD-dir/all
      src/gz armv7a http://www.mysite.com/BOARD-dir/armv7a
-     src/gz beagleboard http://www.mysite.com/BOARD-dir/beagleboard
+     src/gz beaglebone http://www.mysite.com/BOARD-dir/beaglebone
                         </literallayout>
                     </para>
 
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 6340527d05..be67f176fb 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -157,7 +157,7 @@
                     Yocto Project Board Support Package (BSP) Developer's Guide.</para>
                     <note>Five BSPs exist that are part of the
                     Yocto Project release: <filename>genericx86</filename>, <filename>genericx86-64</filename>,
-                    <filename>beagleboard</filename>,
+                    <filename>beaglebone</filename>,
                     <filename>mpc8315e</filename>, and <filename>routerstationpro</filename>.
                     The recipes and configurations for these five BSPs are located and dispersed
                     within the <link linkend='source-directory'>Source Directory</link>.
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 6f58a5771d..37fa5afdd5 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -613,7 +613,7 @@
                 <link linkend='source-directory'>Source Directory</link>, define
                 variables for specific hardware and are only used when building
                 for that target (e.g. the
-                <filename>machine/beagleboard.conf</filename> configuration
+                <filename>machine/beaglebone.conf</filename> configuration
                 file defines variables for the Texas Instruments ARM Cortex-A8
                 development board).
                 Configuration files end with a <filename>.conf</filename>
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 58b508e516..d553ba8f71 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -4301,9 +4301,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
      MACHINE ?= "qemux86-64"
      MACHINE ?= "genericx86"
      MACHINE ?= "genericx86-64"
-     MACHINE ?= "beagleboard"
+     MACHINE ?= "beaglebone"
      MACHINE ?= "mpc8315e-rdb"
-     MACHINE ?= "routerstationpro"
+     MACHINE ?= "edgerouter"
                     </literallayout>
                     The last five are Yocto Project reference hardware boards, which
                     are provided in the <filename>meta-yocto-bsp</filename> layer.