diff --git a/documentation/dev-manual/dev-manual-intro.xml b/documentation/dev-manual/dev-manual-intro.xml
index f3cf489f5b..92d67e0d63 100644
--- a/documentation/dev-manual/dev-manual-intro.xml
+++ b/documentation/dev-manual/dev-manual-intro.xml
@@ -39,8 +39,11 @@
             <link linkend='metadata'>Metadata</link>.
             A good example is Angstrom, which has had a distribution
             based on the Yocto Project since its inception.
-            Other examples include  commercial distributions like
-            Wind River Linux, Mentor Embedded Linux, and ENEA Linux.
+            Other examples include commercial distributions like
+            <ulink url='https://www.yoctoproject.org/organization/wind-river-systems'>Wind River Linux</ulink>,
+            <ulink url='https://www.yoctoproject.org/organization/mentor-graphics'>Mentor Embedded Linux</ulink>,
+            <ulink url='https://www.yoctoproject.org/organization/enea-ab'>ENEA Linux</ulink>
+            and <ulink url='https://www.yoctoproject.org/ecosystem/member-organizations'>others</ulink>.
             See the "<link linkend='creating-your-own-distribution'>Creating Your Own Distribution</link>"
             section for more information.
         </note>
@@ -187,7 +190,7 @@
                     from which the Yocto Project derives its build system (Poky)
                     and to which it contributes.</para></listitem>
                 <listitem><para><emphasis>
-                    <ulink url='http://developer.berlios.de/projects/bitbake/'>
+                    <ulink url='http://www.openembedded.org/wiki/BitBake'>
                     BitBake</ulink>:</emphasis> The tool used by the OpenEmbedded build system
                     to process project metadata.</para></listitem>
                 <listitem><para><emphasis>