diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index 2c150cf94..2411729ef 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -125,17 +125,13 @@ LIBS += -L$(CONFIG_VPP_DIR)/lib64
 COMMON_CFLAGS += -I$(CONFIG_VPP_DIR)/include
 endif
 
+ifeq ($(CONFIG_RDMA),y)
+SYS_LIBS += -libverbs -lrdmacm
+endif
+
 #Attach only if FreeBSD and RDMA is specified with configure
 ifeq ($(OS),FreeBSD)
 ifeq ($(CONFIG_RDMA),y)
-# RDMA Userspace Verbs Library
-ifneq ("$(wildcard /usr/lib/libibverbs.*)","")
-SYS_LIBS += -libverbs
-endif
-# RDMA Connection Manager Library
-ifneq ("$(wildcard /usr/lib/librdmacm.*)","")
-SYS_LIBS += -lrdmacm
-endif
 # Mellanox - MLX4 HBA Userspace Library
 ifneq ("$(wildcard /usr/lib/libmlx4.*)","")
 SYS_LIBS += -lmlx4
diff --git a/test/app/stub/Makefile b/test/app/stub/Makefile
index b4dd7463e..9cca6b2c8 100644
--- a/test/app/stub/Makefile
+++ b/test/app/stub/Makefile
@@ -46,10 +46,6 @@ LIBS += $(SOCK_MODULES_LINKER_ARGS)
 LIBS += $(SPDK_LIB_LINKER_ARGS)
 LIBS += $(ENV_LINKER_ARGS)
 
-ifeq ($(CONFIG_RDMA),y)
-SYS_LIBS += -libverbs -lrdmacm
-endif
-
 all : $(APP)
 	@: