diff --git a/meson.build b/meson.build
index 5dfe67d..8492d5d 100644
--- a/meson.build
+++ b/meson.build
@@ -29,14 +29,23 @@
 conf_data.set_quoted('DUMP_OBJPATH', get_option('DUMP_OBJPATH'),
                       description : 'The Dump manager Dbus root'
                     )
+conf_data.set_quoted('BMC_DUMP_OBJPATH', get_option('BMC_DUMP_OBJPATH'),
+                      description : 'The BMC Dump manager Dbus path'
+                    )
+conf_data.set_quoted('SYSTEM_DUMP_OBJPATH', get_option('SYSTEM_DUMP_OBJPATH'),
+                      description : 'The system Dump manager Dbus path'
+                    )
 conf_data.set_quoted('CORE_FILE_DIR', get_option('CORE_FILE_DIR'),
                       description : 'Directory where core dumps are placed'
                     )
 conf_data.set_quoted('OBJ_INTERNAL', get_option('OBJ_INTERNAL'),
                       description : 'Internal Dump manager Dbus object path'
                     )
-conf_data.set_quoted('OBJ_ENTRY', get_option('OBJ_ENTRY'),
-                      description : 'The dump entry DBus object path'
+conf_data.set_quoted('SYSTEM_DUMP_OBJ_ENTRY', get_option('SYSTEM_DUMP_OBJ_ENTRY'),
+                      description : 'The system dump entry DBus object path'
+                    )
+conf_data.set_quoted('BMC_DUMP_OBJ_ENTRY', get_option('BMC_DUMP_OBJ_ENTRY'),
+                      description : 'The BMC dump entry DBus object path'
                     )
 conf_data.set_quoted('BMC_DUMP_PATH', get_option('BMC_DUMP_PATH'),
                      description : 'Directory where bmc dumps are placed')
@@ -93,6 +102,8 @@
 phosphor_dump_manager_sources = [
         'dump_entry.cpp',
         'dump_manager.cpp',
+        'dump_manager_bmc.cpp',
+        'dump_manager_system.cpp',
         'dump_manager_main.cpp',
         'dump_serialize.cpp',
         'elog_watch.cpp',