diff --git a/.gitmodules b/.gitmodules
index 4dc52ed19..1209fadb8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,5 +6,5 @@ url=https://github.com/wolfSSL/wolfssl.git
 url=https://github.com/wolfSSL/wolfMQTT.git
 [submodule "FreeRTOS-AWS/lib/third_party/wolfssl"]
 	path = FreeRTOS-AWS/lib/third_party/wolfssl
-url=https://github.com/dgarske/wolfssl.git
+url=https://github.com/wolfssl/wolfssl.git
 	branch = mbedtls_compat
diff --git a/FreeRTOS-AWS/lib/third_party/wolfssl b/FreeRTOS-AWS/lib/third_party/wolfssl
index af9507391..8619062ae 160000
--- a/FreeRTOS-AWS/lib/third_party/wolfssl
+++ b/FreeRTOS-AWS/lib/third_party/wolfssl
@@ -1 +1 @@
-Subproject commit af9507391a0b2d9bebb144c80b2071f856ba9caa
+Subproject commit 8619062ae73e34d9f305b71df5aaf920c9bd6a15