diff --git a/external/solanaceae_tox b/external/solanaceae_tox
index f12e609..0e6556c 160000
--- a/external/solanaceae_tox
+++ b/external/solanaceae_tox
@@ -1 +1 @@
-Subproject commit f12e609c21e84b77f5252e6b00e5fdb933b168ab
+Subproject commit 0e6556cd86c558c86dfde60d82891a46bf32b64f
diff --git a/external/toxcore/CMakeLists.txt b/external/toxcore/CMakeLists.txt
index 45fade7..fbd36e6 100644
--- a/external/toxcore/CMakeLists.txt
+++ b/external/toxcore/CMakeLists.txt
@@ -91,6 +91,8 @@ add_library(toxcore STATIC
 	${TOX_DIR}toxcore/logger.h
 	${TOX_DIR}toxcore/Messenger.c
 	${TOX_DIR}toxcore/Messenger.h
+	${TOX_DIR}toxcore/mem.c
+	${TOX_DIR}toxcore/mem.h
 	${TOX_DIR}toxcore/mono_time.c
 	${TOX_DIR}toxcore/mono_time.h
 	${TOX_DIR}toxcore/net_crypto.c
@@ -134,6 +136,10 @@ add_library(toxcore STATIC
 	${TOX_DIR}toxcore/tox_unpack.h
 	${TOX_DIR}toxcore/util.c
 	${TOX_DIR}toxcore/util.h
+
+	${TOX_DIR}toxencryptsave/defines.h
+	${TOX_DIR}toxencryptsave/toxencryptsave.c
+	${TOX_DIR}toxencryptsave/toxencryptsave.h
 )
 
 # HACK: "install" api headers into self
diff --git a/external/toxcore/c-toxcore b/external/toxcore/c-toxcore
index 67badf6..82460b2 160000
--- a/external/toxcore/c-toxcore
+++ b/external/toxcore/c-toxcore
@@ -1 +1 @@
-Subproject commit 67badf69416a74e74f6d7eb51dd96f37282b8455
+Subproject commit 82460b2124216af1ac9d63060de310a682a2fd15