diff --git a/.gitmodules b/.gitmodules
index 8c487bb..0382ceb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,3 +6,6 @@
 	path = openssl
 	url = git@github.com:macssh/openssl.git
 	branch = OpenSSL_0_9_8-stable_macos
+[submodule "mbedtls"]
+	path = mbedtls
+	url = git@github.com:bslabs/mbedtls.git
diff --git a/libssh2 b/libssh2
index a728d4c..66b89d7 160000
--- a/libssh2
+++ b/libssh2
@@ -1 +1 @@
-Subproject commit a728d4c94ab32b465698c852653c5129e85915b7
+Subproject commit 66b89d7677a7c7a9be8e9398f630c02af8457400
diff --git a/mbedtls b/mbedtls
new file mode 160000
index 0000000..a022c32
--- /dev/null
+++ b/mbedtls
@@ -0,0 +1 @@
+Subproject commit a022c329e2f93e07fe4023cc27e615bd669e9f3e
diff --git a/openssl b/openssl
deleted file mode 160000
index 805fc8e..0000000
--- a/openssl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 805fc8e1a5326516d17141df02a8650597678703