diff --git a/.gitmodules b/.gitmodules
index 9d8327b8d..33ccb1384 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "crypto"]
 	path = crypto
-	url = https://github.com/AndrzejKurek/mbed-crypto
+	url = https://github.com/ARMmbed/mbed-crypto
 	branch = development
diff --git a/crypto b/crypto
index 981cbdff7..f54597144 160000
--- a/crypto
+++ b/crypto
@@ -1 +1 @@
-Subproject commit 981cbdff7cc5b0aa11291a5ec4a93d6d1cff5576
+Subproject commit f54597144874b15a576ecd5621f700c74f6fe3d1