diff --git a/userspace/units/Makefile.units.common.tmk b/userspace/units/Makefile.units.common.tmk
index 25337c2f9..a1948d058 100644
--- a/userspace/units/Makefile.units.common.tmk
+++ b/userspace/units/Makefile.units.common.tmk
@@ -58,10 +58,13 @@ NV_COMPONENT_CFLAGS            	+= \
 	-DCONFIG_SUPPORT_PMU_PSTATE \
 	-DCONFIG_TEGRA_NVLINK
 
-
 NV_COMPONENT_NEEDED_INTERFACE_DIRS := \
                                 $(NV_SOURCE)/kernel/nvgpu/userspace
 
+ifdef NVGPU_UNIT_SHARED_LIBRARIES
+NV_COMPONENT_SYSTEM_SHARED_LIBRARIES += $(NVGPU_UNIT_SHARED_LIBRARIES)
+endif
+
 ifdef NVGPU_UNIT_INTERFACE_DIRS
 NV_COMPONENT_NEEDED_INTERFACE_DIRS += \
 				$(NVGPU_UNIT_INTERFACE_DIRS)