diff --git a/common/shlibs b/common/shlibs
index 3d0f761a3e0..014c5d8800a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1363,7 +1363,6 @@ libmutter-wayland.so.0 mutter-wayland-3.10.1_1
 libgdiplus.so.0 libgdiplus-2.10.9_1
 libmonosgen-2.0.so.1 mono-3.2.3_1
 libshout-idjc.so.3 libshout-idjc-2.3.1_1
-libpolarssl.so.7 libpolarssl-1.3.8_1
 libmonoboehm-2.0.so.1 mono-3.2.3_1
 libglusterfs.so.0 libglusterfs-3.4.1_1
 libgfrpc.so.0 libglusterfs-3.4.1_1
@@ -1927,3 +1926,4 @@ librrd_th.so.4 rrdtool-1.4.9_1
 libmosquitto.so.1 libmosquitto-1.4_1
 libmosquittopp.so.1 libmosquittopp-1.4_1
 libmpv.so.1 mpv-0.8.0_2
+libmbedtls.so.8 mbedtls-1.3.10_1
diff --git a/srcpkgs/mbedtls-devel b/srcpkgs/mbedtls-devel
new file mode 120000
index 00000000000..cd5c3f13012
--- /dev/null
+++ b/srcpkgs/mbedtls-devel
@@ -0,0 +1 @@
+mbedtls
\ No newline at end of file
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
new file mode 100644
index 00000000000..49d0be952bc
--- /dev/null
+++ b/srcpkgs/mbedtls/template
@@ -0,0 +1,37 @@
+# Template file for 'mbedtls'
+pkgname=mbedtls
+version=1.3.10
+revision=1
+replaces="polarssl>=0 libpolarssl>=0"
+makedepends="zlib-devel libressl-devel"
+short_desc="Portable cryptographic TLS library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="https://tls.mbed.org/"
+distfiles="https://tls.mbed.org/download/mbedtls-${version}-gpl.tgz"
+checksum=746fd88e0c6623691fc56c4eed52e40a57b2da0ac80f6dd8995094aa6adb407e
+
+do_build() {
+	sed -i -e 's|//\(#define POLARSSL_THREADING_C\)|\1|' \
+		-e 's|//\(#define POLARSSL_THREADING_PTHREAD\)|\1|' \
+		include/polarssl/config.h
+	make CC=$CC SHARED=1 ${makejobs} no_test
+}
+do_install() {
+	make DESTDIR=${DESTDIR}/usr install
+	rm ${DESTDIR}/usr/lib/libmbedtls.so
+	rm ${DESTDIR}/usr/lib/libpolarssl.so
+	ln -s libmbedtls.so.8 ${DESTDIR}/usr/lib/libmedtls.so
+	ln -s libmbedtls.so.8 ${DESTDIR}/usr/lib/libpolarssl.so
+}
+
+mbedtls-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}-${version}_${revision}"
+	replaces="polarssl-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}