diff --git a/programs/Makefile b/programs/Makefile
index b7fcf92c6..ba8dd316b 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -5,7 +5,7 @@
 
 CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
 OFLAGS	= -O2
-LDFLAGS	+= -L../library -lpolarssl $(SYS_LDFLAGS)
+LDFLAGS	+= -L../library -lmbedtls $(SYS_LDFLAGS)
 
 ifdef DEBUG
 CFLAGS += -g3
diff --git a/tests/Makefile b/tests/Makefile
index a0753965b..850ff7bc7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -7,14 +7,14 @@ CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-state
 			-Wno-unused-function -Wno-unused-value
 
 OFLAGS	= -O2
-LDFLAGS	+= -L../library -lpolarssl $(SYS_LDFLAGS)
+LDFLAGS	+= -L../library -lmbedtls $(SYS_LDFLAGS)
 
 ifndef SHARED
 DEP=../library/libmbedtls.a
 CHECK_PRELOAD=
 else
-DEP=../library/libpolarssl.so
-CHECK_PRELOAD= LD_PRELOAD=../library/libpolarssl.so
+DEP=../library/libmbedtls.so
+CHECK_PRELOAD= LD_PRELOAD=../library/libmbedtls.so
 endif
 
 ifdef DEBUG