diff --git a/example/gen/meson.build b/example/gen/meson.build
index 8d7d4de..ef27aee 100644
--- a/example/gen/meson.build
+++ b/example/gen/meson.build
@@ -13,3 +13,23 @@
     )
 endif
 
+inst_markdown_dir = get_option('datadir') / 'doc' / meson.project_name()
+inst_registry_dir = get_option('datadir') / 'redfish-registry' / meson.project_name()
+
+generated_sources = []
+generated_markdown = []
+generated_registry = []
+
+foreach d : yaml_selected_subdirs
+    subdir(d)
+endforeach
+
+generated_headers = []
+foreach s : generated_sources
+    foreach f : s.to_list()
+        if f.full_path().endswith('.hpp')
+            generated_headers += f
+        endif
+    endforeach
+endforeach
+
diff --git a/example/gen/net/poettering/Calculator/meson.build b/example/gen/net/poettering/Calculator/meson.build
index 1b4cc9b..82496e4 100644
--- a/example/gen/net/poettering/Calculator/meson.build
+++ b/example/gen/net/poettering/Calculator/meson.build
@@ -1,8 +1,22 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'net/poettering/Calculator'
+
 generated_sources += custom_target(
     'net/poettering/Calculator__cpp'.underscorify(),
-    input: [ '../../../../yaml/net/poettering/Calculator.events.yaml', '../../../../yaml/net/poettering/Calculator.interface.yaml',  ],
-    output: [ 'event.cpp', 'event.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../yaml/net/poettering/Calculator.events.yaml',
+        '../../../../yaml/net/poettering/Calculator.interface.yaml',
+    ],
+    output: [
+        'event.cpp',
+        'event.hpp',
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +25,16 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'net/poettering/Calculator',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/example/gen/net/poettering/meson.build b/example/gen/net/poettering/meson.build
index 62b350e..149b068 100644
--- a/example/gen/net/poettering/meson.build
+++ b/example/gen/net/poettering/meson.build
@@ -1,6 +1,9 @@
 # Generated file; do not modify.
 subdir('Calculator')
-generated_others += custom_target(
+
+sdbusplus_current_path = 'net/poettering'
+
+generated_markdown += custom_target(
     'net/poettering/Calculator__markdown'.underscorify(),
     input: [ '../../../yaml/net/poettering/Calculator.events.yaml', '../../../yaml/net/poettering/Calculator.interface.yaml',  ],
     output: [ 'Calculator.md' ],
@@ -12,9 +15,12 @@
         '--directory', meson.current_source_dir() / '../../../yaml',
         'net/poettering/Calculator',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-generated_others += custom_target(
+generated_registry += custom_target(
     'net/poettering/Calculator__registry'.underscorify(),
     input: [ '../../../yaml/net/poettering/Calculator.events.yaml',  ],
     output: [ 'Calculator.json' ],
@@ -26,5 +32,8 @@
         '--directory', meson.current_source_dir() / '../../../yaml',
         'net/poettering/Calculator',
     ],
+    install: should_generate_registry,
+    install_dir: [inst_registry_dir / sdbusplus_current_path],
+    build_by_default: should_generate_registry,
 )
 
diff --git a/example/meson.build b/example/meson.build
index bb4f4a4..8a63e8e 100644
--- a/example/meson.build
+++ b/example/meson.build
@@ -50,18 +50,8 @@
     dependencies: asio_dep,
 )
 
-generated_sources = []
-generated_others = []
+yaml_selected_subdirs = ['net']
 subdir('gen')
-subdir('gen/net')
-
-custom_target(
-    'example_md',
-    command: 'true',
-    output: 'example_md',
-    capture: true,
-    depends: generated_others,
-    build_by_default: true)
 
 executable(
     'calculator-server',