diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index 5833e42c7d..0d5b6b1365 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -123,9 +123,14 @@
2.6
- &REL_MONTH_YEAR;
+ November 2018
Released with the Yocto Project 2.6 Release.
+
+ 2.6.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 2.6.1 Release.
+
diff --git a/documentation/dev-manual/dev-manual.xml b/documentation/dev-manual/dev-manual.xml
index 9831e2ac15..b54c0d65d5 100644
--- a/documentation/dev-manual/dev-manual.xml
+++ b/documentation/dev-manual/dev-manual.xml
@@ -108,9 +108,14 @@
2.6
- &REL_MONTH_YEAR;
+ November 2018
Released with the Yocto Project 2.6 Release.
+
+ 2.6.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 2.6.1 Release.
+
diff --git a/documentation/kernel-dev/kernel-dev.xml b/documentation/kernel-dev/kernel-dev.xml
index 4045768493..fc46c205b5 100644
--- a/documentation/kernel-dev/kernel-dev.xml
+++ b/documentation/kernel-dev/kernel-dev.xml
@@ -93,9 +93,14 @@
2.6
- &REL_MONTH_YEAR;
+ November 2018
Released with the Yocto Project 2.6 Release.
+
+ 2.6.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 2.6.1 Release.
+
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index 7c6fe7e3a6..7a4199198b 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -77,9 +77,14 @@
2.6
- &REL_MONTH_YEAR;
+ November 2018
Released with the Yocto Project 2.6 Release.
+
+ 2.6.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 2.6.1 Release.
+
diff --git a/documentation/overview-manual/overview-manual.xml b/documentation/overview-manual/overview-manual.xml
index b23c39497c..320ca35530 100644
--- a/documentation/overview-manual/overview-manual.xml
+++ b/documentation/overview-manual/overview-manual.xml
@@ -38,9 +38,14 @@
2.6
- &REL_MONTH_YEAR;
+ November 2018
Released with the Yocto Project 2.6 Release.
+
+ 2.6.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 2.6.1 Release.
+
diff --git a/documentation/poky.ent b/documentation/poky.ent
index 586bfe7f71..c76fe7b2d3 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -1,17 +1,17 @@
-
-
+
+
-
-
-
+
+
+
-
+
-
-
+
+
diff --git a/documentation/profile-manual/profile-manual.xml b/documentation/profile-manual/profile-manual.xml
index bce030885a..10ca68e501 100644
--- a/documentation/profile-manual/profile-manual.xml
+++ b/documentation/profile-manual/profile-manual.xml
@@ -93,9 +93,14 @@
2.6
- &REL_MONTH_YEAR;
+ November 2018
Released with the Yocto Project 2.6 Release.
+
+ 2.6.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 2.6.1 Release.
+
diff --git a/documentation/ref-manual/ref-manual.xml b/documentation/ref-manual/ref-manual.xml
index 1504e91581..f834d2dead 100644
--- a/documentation/ref-manual/ref-manual.xml
+++ b/documentation/ref-manual/ref-manual.xml
@@ -124,9 +124,14 @@
2.6
- &REL_MONTH_YEAR;
+ November 2018
Released with the Yocto Project 2.6 Release.
+
+ 2.6.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 2.6.1 Release.
+
diff --git a/documentation/sdk-manual/sdk-manual.xml b/documentation/sdk-manual/sdk-manual.xml
index 78c60a620c..7f93d5f611 100644
--- a/documentation/sdk-manual/sdk-manual.xml
+++ b/documentation/sdk-manual/sdk-manual.xml
@@ -58,9 +58,14 @@
2.6
- &REL_MONTH_YEAR;
+ November 2018
Released with the Yocto Project 2.6 Release.
+
+ 2.6.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 2.6.1 Release.
+
diff --git a/documentation/toaster-manual/toaster-manual.xml b/documentation/toaster-manual/toaster-manual.xml
index 80ac579bbb..dcc2990dcd 100644
--- a/documentation/toaster-manual/toaster-manual.xml
+++ b/documentation/toaster-manual/toaster-manual.xml
@@ -68,9 +68,14 @@
2.6
- &REL_MONTH_YEAR;
+ November 2018
Released with the Yocto Project 2.6 Release.
+
+ 2.6.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 2.6.1 Release.
+
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index 83f05e27e5..f6e205feb3 100644
--- a/documentation/tools/mega-manual.sed
+++ b/documentation/tools/mega-manual.sed
@@ -2,39 +2,39 @@
# This style is for manual folders like "yocto-project-qs" and "poky-ref-manual".
# This is the old way that did it. Can't do that now that we have "bitbake-user-manual" strings
# in the mega-manual.
-# s@"ulink" href="http://www.yoctoproject.org/docs/2.6/[a-z]*-[a-z]*-[a-z]*/[a-z]*-[a-z]*-[a-z]*.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/yocto-project-qs/yocto-project-qs.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/poky-ref-manual/poky-ref-manual.html#@"link" href="#@g
+# s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/[a-z]*-[a-z]*-[a-z]*/[a-z]*-[a-z]*-[a-z]*.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/yocto-project-qs/yocto-project-qs.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/poky-ref-manual/poky-ref-manual.html#@"link" href="#@g
# Processes all other manuals (- style) except for the BitBake User Manual because
# it is not included in the mega-manual.
# This style is for manual folders that use two word, which is the standard now (e.g. "ref-manual").
# This was the one-liner that worked before we introduced the BitBake User Manual, which is
# not in the mega-manual.
-# s@"ulink" href="http://www.yoctoproject.org/docs/2.6/[a-z]*-[a-z]*/[a-z]*-[a-z]*.html#@"link" href="#@g
+# s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/[a-z]*-[a-z]*/[a-z]*-[a-z]*.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/sdk-manual/sdk-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/bsp-guide/bsp-guide.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/dev-manual/dev-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/overview-manual/overview-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/brief-yoctoprojectqs/brief-yoctoprojectqs.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/kernel-dev/kernel-dev.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/profile-manual/profile-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/ref-manual/ref-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.6/toaster-manual/toaster-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/sdk-manual/sdk-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/bsp-guide/bsp-guide.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/dev-manual/dev-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/overview-manual/overview-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/brief-yoctoprojectqs/brief-yoctoprojectqs.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/kernel-dev/kernel-dev.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/profile-manual/profile-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/ref-manual/ref-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/2.6.1/toaster-manual/toaster-manual.html#@"link" href="#@g
# Process cases where just an external manual is referenced without an id anchor
-s@Yocto Project Quick Build@Yocto Project Quick Build@g
-s@Yocto Project Quick Start@Yocto Project Quick Start@g
-s@Yocto Project Development Tasks Manual@Yocto Project Development Tasks Manual@g
-s@Yocto Project Overview and Concepts Manual@Yocto project Overview and Concepts Manual@g
-s@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@g
-s@Yocto Project Board Support Package (BSP) Developer's Guide@Yocto Project Board Support Package (BSP) Developer's Guide@g
-s@Yocto Project Profiling and Tracing Manual@Yocto Project Profiling and Tracing Manual@g
-s@Yocto Project Linux Kernel Development Manual@Yocto Project Linux Kernel Development Manual@g
-s@Yocto Project Reference Manual@Yocto Project Reference Manual@g
-s@Toaster User Manual@Toaster User Manual@g
+s@Yocto Project Quick Build@Yocto Project Quick Build@g
+s@Yocto Project Quick Start@Yocto Project Quick Start@g
+s@Yocto Project Development Tasks Manual@Yocto Project Development Tasks Manual@g
+s@Yocto Project Overview and Concepts Manual@Yocto project Overview and Concepts Manual@g
+s@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@g
+s@Yocto Project Board Support Package (BSP) Developer's Guide@Yocto Project Board Support Package (BSP) Developer's Guide@g
+s@Yocto Project Profiling and Tracing Manual@Yocto Project Profiling and Tracing Manual@g
+s@Yocto Project Linux Kernel Development Manual@Yocto Project Linux Kernel Development Manual@g
+s@Yocto Project Reference Manual@Yocto Project Reference Manual@g
+s@Toaster User Manual@Toaster User Manual@g
# Process a single, rouge occurrence of a linked reference to the Mega-Manual.
-s@Yocto Project Mega-Manual@Yocto Project Mega-Manual@g
+s@Yocto Project Mega-Manual@Yocto Project Mega-Manual@g