diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile
index 068042df8..9502ea76d 100644
--- a/app/iscsi_tgt/Makefile
+++ b/app/iscsi_tgt/Makefile
@@ -55,7 +55,7 @@ endif
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
 	$(NET_MODULES_LINKER_ARGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS) -lcrypto
+LIBS += $(SPDK_LIB_LINKER_ARGS)
 LIBS += $(ENV_LINKER_ARGS)
 
 all : $(APP)
diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile
index 501d69390..1966b400b 100644
--- a/app/spdk_tgt/Makefile
+++ b/app/spdk_tgt/Makefile
@@ -57,7 +57,6 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
 	$(NET_MODULES_LINKER_ARGS) \
 	$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
-LIBS += -lcrypto
 
 all: $(APP)
 	@:
diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index 28bec9d6c..98a8c32ab 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -192,6 +192,7 @@ CXXFLAGS += $(COMMON_CFLAGS) -std=c++0x
 
 SYS_LIBS += -lrt
 SYS_LIBS += -luuid
+SYS_LIBS += -lcrypto
 
 MAKEFLAGS += --no-print-directory
 
diff --git a/shared_lib/Makefile b/shared_lib/Makefile
index 8bf88222d..1ede8bc88 100644
--- a/shared_lib/Makefile
+++ b/shared_lib/Makefile
@@ -91,7 +91,6 @@ $(SHARED_LIB): $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(
 		$(filter-out -Wl$(comma)--no-whole-archive,$(LIBS)) \
 		-Wl,--no-whole-archive \
 		-Wl,--version-script=spdk.map \
-		-lcrypto \
 		$(SYS_LIBS)
 
 .PHONY: all clean $(DIRS-y)
diff --git a/test/unit/lib/iscsi/iscsi.c/Makefile b/test/unit/lib/iscsi/iscsi.c/Makefile
index 2093a6eb3..bc9a9d8b5 100644
--- a/test/unit/lib/iscsi/iscsi.c/Makefile
+++ b/test/unit/lib/iscsi/iscsi.c/Makefile
@@ -41,7 +41,7 @@ SCSI_OBJS = port
 ISCSI_OBJS = md5 param
 LIBS += $(SCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/scsi/%.o)
 LIBS += $(ISCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/iscsi/%.o)
-LIBS += -lcunit -lcrypto $(ENV_LINKER_ARGS)
+LIBS += -lcunit $(ENV_LINKER_ARGS)
 
 TEST_FILE = iscsi_ut.c