diff --git a/meson.build b/meson.build
index 1fd2b6b..0cd2f44 100644
--- a/meson.build
+++ b/meson.build
@@ -79,6 +79,7 @@
   'hybrid-sensors'             : '-DFEATURE_HYBRID_SENSORS',
   'sensors-cache'              : '-DFEATURE_SENSORS_CACHE',
   'sel-logger-clears-sel'      : '-DFEATURE_SEL_LOGGER_CLEARS_SEL',
+  'dynamic-storages-only'      : '-DFEATURE_DYNAMIC_STORAGES_ONLY',
 }
 
 foreach option_key, option_value : feature_map
@@ -204,6 +205,11 @@
   transportoem_src = ['transporthandler_oem.cpp']
 endif
 
+storage_cmds_src = []
+if get_option('dynamic-sensors').disabled() and not get_option('dynamic-storages-only').disabled()
+  storage_cmds_src = ['dbus-sdr/storagecommands.cpp', 'dbus-sdr/sdrutils.cpp']
+endif
+
 libipmi20_src = [
   'app/channel.cpp',
   'app/watchdog.cpp',
@@ -226,6 +232,7 @@
   'user_channel/channelcommands.cpp',
   generated_src,
   transportoem_src,
+  storage_cmds_src,
   conf_h,
 ]