diff --git a/libraries/mbedtls/mbedtls.SlackBuild b/libraries/mbedtls/mbedtls.SlackBuild
index cadb659cfe..c7c57925d2 100644
--- a/libraries/mbedtls/mbedtls.SlackBuild
+++ b/libraries/mbedtls/mbedtls.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mbedtls
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-2.6.1}
 LICENSE=apache
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,14 +35,14 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -62,9 +62,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-$LICENSE.tgz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -72,30 +72,27 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-
 mkdir build
 cd build
-cmake \
-  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-  -DSYSCONF_INSTALL_DIR:PATH=/etc \
-  -DINCLUDE_INSTALL_DIR:PATH=/usr/include \
-  -DLIB_INSTALL_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \
-  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-  -DSHARE_INSTALL_PREFIX:PATH=/usr/share \
-  -DMAN_INSTALL_DIR:PATH=/usr/man \
-  -DCMAKE_BUILD_TYPE:STRING=Release \
-  -DBUILD_SHARED_LIBS:BOOL=ON \
-  -DCMAKE_SKIP_RPATH:BOOL=ON \
-  -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-  -DUSE_SHARED_POLARSSL_LIBRARY:BOOL=ON \
-  -DUSE_STATIC_POLARSSL_LIBRARY:BOOL=OFF \
-  ..
-
-make
-make install DESTDIR=$PKG
-
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DSYSCONF_INSTALL_DIR:PATH=/etc \
+    -DINCLUDE_INSTALL_DIR:PATH=/usr/include \
+    -DLIB_INSTALL_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DSHARE_INSTALL_PREFIX:PATH=/usr/share \
+    -DMAN_INSTALL_DIR:PATH=/usr/man \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DCMAKE_SKIP_RPATH:BOOL=ON \
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+    -DUSE_SHARED_MBEDTLS_LIBRARY=On \
+    -DUSE_STATIC_MBEDTLS_LIBRARY=Off \
+    -DENABLE_TESTING=Off \
+    -DCMAKE_BUILD_TYPE:STRING=Release ..
+  make
+  make install DESTDIR=$PKG
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/libraries/mbedtls/mbedtls.info b/libraries/mbedtls/mbedtls.info
index 338f4dc5c2..d83b1614ce 100644
--- a/libraries/mbedtls/mbedtls.info
+++ b/libraries/mbedtls/mbedtls.info
@@ -1,8 +1,8 @@
 PRGNAM="mbedtls"
-VERSION="2.2.0"
+VERSION="2.6.1"
 HOMEPAGE="https://tls.mbed.org"
-DOWNLOAD="https://tls.mbed.org/download/mbedtls-2.2.0-apache.tgz"
-MD5SUM="b02f6be0f26f00c20e0c24d64b628e62"
+DOWNLOAD="https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.6.1/mbedtls-mbedtls-2.6.1.tar.gz"
+MD5SUM="cb929d554fc5485e579508c15d3d48d7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/mbedtls/slack-desc b/libraries/mbedtls/slack-desc
index a62bf39e8c..c7ad6e00c6 100644
--- a/libraries/mbedtls/slack-desc
+++ b/libraries/mbedtls/slack-desc
@@ -15,5 +15,5 @@ mbedtls: applications with as little hassle as possible.
 mbedtls:
 mbedtls: https://tls.mbed.org/
 mbedtls:
-mbedtls:
+mbedtls: NOTE: this project was formerly know as PolarSSL.
 mbedtls: