diff --git a/Documentation/conf.py b/Documentation/conf.py
index 022e698efac4..7675efb6682a 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -21,8 +21,8 @@
 # -- Project information -----------------------------------------------------
 
 project = 'libcamera'
-copyright = '2018-2019, The libcamera documentation authors'
-author = u'Kieran Bingham, Jacopo Mondi, Laurent Pinchart, Niklas Söderlund'
+copyright = '2018-2024, The libcamera documentation authors'
+author = u'Kieran Bingham, Jacopo Mondi, Laurent Pinchart, Niklas Söderlund, Stefan Klug'
 
 # Version information is provided by the build environment, through the
 # sphinx command line.
diff --git a/Documentation/guides/tuning b/Documentation/guides/tuning
new file mode 120000
index 000000000000..3e62b7b660d0
--- /dev/null
+++ b/Documentation/guides/tuning
@@ -0,0 +1 @@
+../../subprojects/libcamera-tuning-guide/content/
\ No newline at end of file
diff --git a/Documentation/index.rst b/Documentation/index.rst
index 5442ae75dde7..991dcf2b66fb 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -16,6 +16,7 @@
 
    Developer Guide <guides/introduction>
    Application Writer's Guide <guides/application-developer>
+   Sensor Tuning Guide <guides/tuning/tuning>
    Pipeline Handler Writer's Guide <guides/pipeline-handler>
    IPA Writer's guide <guides/ipa>
    Tracing guide <guides/tracing>
diff --git a/Documentation/meson.build b/Documentation/meson.build
index 1ba40fdf67ac..58c656a54150 100644
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@ -143,6 +143,8 @@ if sphinx.found()
        '../README.rst',
     ]
 
+    subproject('libcamera-tuning-guide', required : true)
+
     release = 'release=v' + libcamera_git_version
 
     custom_target('documentation',
diff --git a/subprojects/libcamera-tuning-guide.wrap b/subprojects/libcamera-tuning-guide.wrap
new file mode 100644
index 000000000000..d8e172471fa6
--- /dev/null
+++ b/subprojects/libcamera-tuning-guide.wrap
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: CC0-1.0
+
+[wrap-git]
+directory = libcamera-tuning-guide
+url = https://git.uk.ideasonboard.com/sklug/libcamera-tuning-guide.git
+# tags/0.2.5
+revision = head
