diff --git a/include/pcieslot.hpp b/include/pcieslot.hpp
index b578cbb..857ac24 100644
--- a/include/pcieslot.hpp
+++ b/include/pcieslot.hpp
@@ -139,6 +139,15 @@
 const std::map<uint8_t, size_t> pcieLanesTable = {
     {0x08, 1}, {0x09, 2}, {0xa, 4}, {0xb, 8}, {0xc, 12}, {0xd, 16}, {0xe, 32}};
 
+enum class Availability : uint8_t
+{
+    Other = 0x01,
+    Unknown = 0x02,
+    Available = 0x03,
+    InUse = 0x04,
+    Unavailable = 0x05
+};
+
 }; // namespace smbios
 
 }; // namespace phosphor
diff --git a/meson.options b/meson.options
index 935670d..b7f5265 100644
--- a/meson.options
+++ b/meson.options
@@ -29,6 +29,13 @@
 )
 
 option(
+  'slot-drive-presence',
+  type: 'feature',
+  value: 'disabled',
+  description: 'Sets drive presence on slot objects'
+)
+
+option(
     'cpuinfo-peci',
     type: 'feature',
     value: 'enabled',
diff --git a/src/meson.build b/src/meson.build
index 18d858d..1c983bd 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -11,6 +11,10 @@
     cpp_args_smbios += ['-DDIMM_ONLY_LOCATOR']
 endif
 
+if get_option('slot-drive-presence').allowed()
+    cpp_args_smbios += ['-DSLOT_DRIVE_PRESENCE']
+endif
+
 executable(
     'smbiosmdrv2app',
     'mdrv2.cpp',
diff --git a/src/pcieslot.cpp b/src/pcieslot.cpp
index 63d7f91..832194b 100644
--- a/src/pcieslot.cpp
+++ b/src/pcieslot.cpp
@@ -50,8 +50,14 @@
     pcieIsHotPluggable(pcieInfo->characteristics2);
     pcieLocation(pcieInfo->slotDesignation, pcieInfo->length, dataIn);
 
+#ifdef SLOT_DRIVE_PRESENCE
+    /* Set PCIeSlot presence based on its current Usage */
+    Item::present(pcieInfo->currUsage ==
+                  static_cast<uint8_t>(Availability::InUse));
+#else
     /* Pcie slot is embedded on the board. Always be true */
     Item::present(true);
+#endif
 
     if (!motherboardPath.empty())
     {