diff --git a/sim/mcuboot-sys/build.rs b/sim/mcuboot-sys/build.rs
index 7c1db9e..7d82c48 100644
--- a/sim/mcuboot-sys/build.rs
+++ b/sim/mcuboot-sys/build.rs
@@ -56,15 +56,15 @@
         }
         conf.define("MCUBOOT_USE_MBED_TLS", None);
 
-        conf.include("mbedtls/include");
-        conf.file("mbedtls/library/sha256.c");
+        conf.include("../../ext/mbedtls/include");
+        conf.file("../../ext/mbedtls/library/sha256.c");
         conf.file("csupport/keys.c");
 
-        conf.file("mbedtls/library/rsa.c");
-        conf.file("mbedtls/library/bignum.c");
-        conf.file("mbedtls/library/platform.c");
-        conf.file("mbedtls/library/platform_util.c");
-        conf.file("mbedtls/library/asn1parse.c");
+        conf.file("../../ext/mbedtls/library/rsa.c");
+        conf.file("../../ext/mbedtls/library/bignum.c");
+        conf.file("../../ext/mbedtls/library/platform.c");
+        conf.file("../../ext/mbedtls/library/platform_util.c");
+        conf.file("../../ext/mbedtls/library/asn1parse.c");
     } else if sig_ecdsa {
         conf.define("MCUBOOT_SIGN_EC256", None);
         conf.define("MCUBOOT_USE_TINYCRYPT", None);
@@ -88,20 +88,20 @@
         conf.define("MCUBOOT_SIGN_ED25519", None);
         conf.define("MCUBOOT_USE_MBED_TLS", None);
 
-        conf.include("mbedtls/include");
-        conf.file("mbedtls/library/sha256.c");
-        conf.file("mbedtls/library/sha512.c");
+        conf.include("../../ext/mbedtls/include");
+        conf.file("../../ext/mbedtls/library/sha256.c");
+        conf.file("../../ext/mbedtls/library/sha512.c");
         conf.file("csupport/keys.c");
         conf.file("../../ext/fiat/src/curve25519.c");
-        conf.file("mbedtls/library/platform.c");
-        conf.file("mbedtls/library/platform_util.c");
-        conf.file("mbedtls/library/asn1parse.c");
+        conf.file("../../ext/mbedtls/library/platform.c");
+        conf.file("../../ext/mbedtls/library/platform_util.c");
+        conf.file("../../ext/mbedtls/library/asn1parse.c");
     } else {
         // Neither signature type, only verify sha256. The default
         // configuration file bundled with mbedTLS is sufficient.
         conf.define("MCUBOOT_USE_MBED_TLS", None);
-        conf.include("mbedtls/include");
-        conf.file("mbedtls/library/sha256.c");
+        conf.include("../../ext/mbedtls/include");
+        conf.file("../../ext/mbedtls/library/sha256.c");
     }
 
     if overwrite_only {
@@ -117,18 +117,18 @@
         conf.file("../../boot/bootutil/src/encrypted.c");
         conf.file("csupport/keys.c");
 
-        conf.include("mbedtls/include");
-        conf.file("mbedtls/library/sha256.c");
+        conf.include("../../ext/mbedtls/include");
+        conf.file("../../ext/mbedtls/library/sha256.c");
 
-        conf.file("mbedtls/library/platform.c");
-        conf.file("mbedtls/library/platform_util.c");
-        conf.file("mbedtls/library/rsa.c");
-        conf.file("mbedtls/library/rsa_internal.c");
-        conf.file("mbedtls/library/md.c");
-        conf.file("mbedtls/library/md_wrap.c");
-        conf.file("mbedtls/library/aes.c");
-        conf.file("mbedtls/library/bignum.c");
-        conf.file("mbedtls/library/asn1parse.c");
+        conf.file("../../ext/mbedtls/library/platform.c");
+        conf.file("../../ext/mbedtls/library/platform_util.c");
+        conf.file("../../ext/mbedtls/library/rsa.c");
+        conf.file("../../ext/mbedtls/library/rsa_internal.c");
+        conf.file("../../ext/mbedtls/library/md.c");
+        conf.file("../../ext/mbedtls/library/md_wrap.c");
+        conf.file("../../ext/mbedtls/library/aes.c");
+        conf.file("../../ext/mbedtls/library/bignum.c");
+        conf.file("../../ext/mbedtls/library/asn1parse.c");
     }
 
     if enc_kw {
@@ -139,17 +139,17 @@
         conf.file("csupport/keys.c");
 
         if sig_rsa || sig_rsa3072 {
-            conf.file("mbedtls/library/sha256.c");
+            conf.file("../../ext/mbedtls/library/sha256.c");
         }
 
         /* Simulator uses Mbed-TLS to wrap keys */
-        conf.include("mbedtls/include");
-        conf.file("mbedtls/library/platform.c");
-        conf.file("mbedtls/library/platform_util.c");
-        conf.file("mbedtls/library/nist_kw.c");
-        conf.file("mbedtls/library/cipher.c");
-        conf.file("mbedtls/library/cipher_wrap.c");
-        conf.file("mbedtls/library/aes.c");
+        conf.include("../../ext/mbedtls/include");
+        conf.file("../../ext/mbedtls/library/platform.c");
+        conf.file("../../ext/mbedtls/library/platform_util.c");
+        conf.file("../../ext/mbedtls/library/nist_kw.c");
+        conf.file("../../ext/mbedtls/library/cipher.c");
+        conf.file("../../ext/mbedtls/library/cipher_wrap.c");
+        conf.file("../../ext/mbedtls/library/aes.c");
 
         if sig_ecdsa {
             conf.define("MCUBOOT_USE_TINYCRYPT", None);
@@ -210,8 +210,8 @@
     walk_dir("../../ext/tinycrypt/lib/source").unwrap();
     walk_dir("../../ext/mbedtls-asn1").unwrap();
     walk_dir("csupport").unwrap();
-    walk_dir("mbedtls/include").unwrap();
-    walk_dir("mbedtls/library").unwrap();
+    walk_dir("../../ext/mbedtls/include").unwrap();
+    walk_dir("../../ext/mbedtls/library").unwrap();
 }
 
 // Output the names of all files within a directory so that Cargo knows when to rebuild.
diff --git a/sim/mcuboot-sys/mbedtls b/sim/mcuboot-sys/mbedtls
deleted file mode 160000
index 60fbd5b..0000000
--- a/sim/mcuboot-sys/mbedtls
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 60fbd5bdf05c223b641677204469b53c2ff39d4e