diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd20e112fe..6944124c74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Unreleased
 
 Bug fixes:
+- [#536 Import missing component macros](https://github.com/alphagov/govuk_prototype_kit/pull/536)
 - [#532 Update repo links from govuk_prototype_kit to govuk-prototype-kit](https://github.com/alphagov/govuk_prototype_kit/pull/532)
 
 - [#540 Fix grid css classes on check-your-answers page](https://github.com/alphagov/govuk-prototype-kit/pull/540)
diff --git a/app/views/layout.html b/app/views/layout.html
index 70a22f0117..36640c356f 100644
--- a/app/views/layout.html
+++ b/app/views/layout.html
@@ -11,13 +11,14 @@
 {% from "fieldset/macro.njk"      import govukFieldset %}
 {% from "file-upload/macro.njk"   import govukFileUpload %}
 {% from "input/macro.njk"         import govukInput %}
-{% from "label/macro.njk"         import govukLabel %}
+{% from "inset-text/macro.njk"    import govukInsetText %}
 {% from "panel/macro.njk"         import govukPanel %}
 {% from "phase-banner/macro.njk"  import govukPhaseBanner %}
 {% from "radios/macro.njk"        import govukRadios %}
 {% from "select/macro.njk"        import govukSelect %}
 {% from "skip-link/macro.njk"     import govukSkipLink %}
 {% from "table/macro.njk"         import govukTable %}
+{% from "tabs/macro.njk"          import govukTabs %}
 {% from "tag/macro.njk"           import govukTag %}
 {% from "textarea/macro.njk"      import govukTextarea %}
 {% from "warning-text/macro.njk"  import govukWarningText %}
diff --git a/docs/views/layout.html b/docs/views/layout.html
index dcc104ae65..bd139965ce 100644
--- a/docs/views/layout.html
+++ b/docs/views/layout.html
@@ -11,13 +11,14 @@
 {% from "fieldset/macro.njk"      import govukFieldset %}
 {% from "file-upload/macro.njk"   import govukFileUpload %}
 {% from "input/macro.njk"         import govukInput %}
-{% from "label/macro.njk"         import govukLabel %}
+{% from "inset-text/macro.njk"    import govukInsetText %}
 {% from "panel/macro.njk"         import govukPanel %}
 {% from "phase-banner/macro.njk"  import govukPhaseBanner %}
 {% from "radios/macro.njk"        import govukRadios %}
 {% from "select/macro.njk"        import govukSelect %}
 {% from "skip-link/macro.njk"     import govukSkipLink %}
 {% from "table/macro.njk"         import govukTable %}
+{% from "tabs/macro.njk"          import govukTabs %}
 {% from "tag/macro.njk"           import govukTag %}
 {% from "textarea/macro.njk"      import govukTextarea %}
 {% from "warning-text/macro.njk"  import govukWarningText %}