diff --git a/documentation/conf.py b/documentation/conf.py
index 54d8db4b47..546ca723a9 100644
--- a/documentation/conf.py
+++ b/documentation/conf.py
@@ -35,6 +35,7 @@ sys.path.insert(0, os.path.abspath('sphinx'))
 extensions = [
     'sphinx.ext.autosectionlabel',
     'sphinx.ext.extlinks',
+    'sphinx.ext.intersphinx',
     'yocto-vars'
 ]
 autosectionlabel_prefix_document = True
@@ -72,6 +73,11 @@ extlinks = {
     'oe_lists': ('https://lists.openembedded.org%s', None),
 }
 
+# Intersphinx config to use cross reference with Bitbake user manual
+intersphinx_mapping = {
+    'bitbake': ('https://docs.yoctoproject.org/bitbake/', None)
+}
+
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for