diff --git a/.gitignore b/.gitignore
index f215cd39..e79ffff5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,7 @@ test/default/*.res
test/default/*.trs
test/default/aead_aes256gcm
test/default/aead_aes256gcm2
+test/default/aead_aesgis256
test/default/aead_chacha20poly1305
test/default/aead_chacha20poly13052
test/default/aead_xchacha20poly1305
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index 162b8aa0..7213fbf3 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -173,6 +173,7 @@
+
@@ -198,6 +199,7 @@
+
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
index 0c57629b..e13debad 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
@@ -312,6 +312,9 @@
crypto_aead\xchacha20poly1305\sodium
+
+ crypto_aead\aegis256\aesni
+
crypto_aead\aes256gcm\aesni
@@ -383,6 +386,9 @@
include\sodium
+
+ include\sodium
+
include\sodium
@@ -745,6 +751,12 @@
{a6837e41-3751-38c9-bb90-dd59d5f4af7b}
+
+ {6897a4cc-0091-3970-b712-c0ac75c16b67}
+
+
+ {53f55581-bb1c-3fe5-8c1b-1dd4243765ef}
+
{3e53394c-b59c-30cc-ae69-a4f46f9edfa3}
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index 091a2300..fee23f34 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -173,6 +173,7 @@
+
@@ -198,6 +199,7 @@
+
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
index 0c57629b..e13debad 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
@@ -312,6 +312,9 @@
crypto_aead\xchacha20poly1305\sodium
+
+ crypto_aead\aegis256\aesni
+
crypto_aead\aes256gcm\aesni
@@ -383,6 +386,9 @@
include\sodium
+
+ include\sodium
+
include\sodium
@@ -745,6 +751,12 @@
{a6837e41-3751-38c9-bb90-dd59d5f4af7b}
+
+ {6897a4cc-0091-3970-b712-c0ac75c16b67}
+
+
+ {53f55581-bb1c-3fe5-8c1b-1dd4243765ef}
+
{3e53394c-b59c-30cc-ae69-a4f46f9edfa3}
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index 1b088637..deec6006 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -173,6 +173,7 @@
+
@@ -198,6 +199,7 @@
+
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
index 0c57629b..e13debad 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
@@ -312,6 +312,9 @@
crypto_aead\xchacha20poly1305\sodium
+
+ crypto_aead\aegis256\aesni
+
crypto_aead\aes256gcm\aesni
@@ -383,6 +386,9 @@
include\sodium
+
+ include\sodium
+
include\sodium
@@ -745,6 +751,12 @@
{a6837e41-3751-38c9-bb90-dd59d5f4af7b}
+
+ {6897a4cc-0091-3970-b712-c0ac75c16b67}
+
+
+ {53f55581-bb1c-3fe5-8c1b-1dd4243765ef}
+
{3e53394c-b59c-30cc-ae69-a4f46f9edfa3}
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index 9b127a12..5acd99e5 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -173,6 +173,7 @@
+
@@ -198,6 +199,7 @@
+
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
index 0c57629b..e13debad 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
@@ -312,6 +312,9 @@
crypto_aead\xchacha20poly1305\sodium
+
+ crypto_aead\aegis256\aesni
+
crypto_aead\aes256gcm\aesni
@@ -383,6 +386,9 @@
include\sodium
+
+ include\sodium
+
include\sodium
@@ -745,6 +751,12 @@
{a6837e41-3751-38c9-bb90-dd59d5f4af7b}
+
+ {6897a4cc-0091-3970-b712-c0ac75c16b67}
+
+
+ {53f55581-bb1c-3fe5-8c1b-1dd4243765ef}
+
{3e53394c-b59c-30cc-ae69-a4f46f9edfa3}
diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
index be249f0c..8d11cde2 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
@@ -173,6 +173,7 @@
+
@@ -198,6 +199,7 @@
+
diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters
index 0c57629b..e13debad 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters
@@ -312,6 +312,9 @@
crypto_aead\xchacha20poly1305\sodium
+
+ crypto_aead\aegis256\aesni
+
crypto_aead\aes256gcm\aesni
@@ -383,6 +386,9 @@
include\sodium
+
+ include\sodium
+
include\sodium
@@ -745,6 +751,12 @@
{a6837e41-3751-38c9-bb90-dd59d5f4af7b}
+
+ {6897a4cc-0091-3970-b712-c0ac75c16b67}
+
+
+ {53f55581-bb1c-3fe5-8c1b-1dd4243765ef}
+
{3e53394c-b59c-30cc-ae69-a4f46f9edfa3}
diff --git a/builds/msvc/vs2019/libsodium/libsodium.vcxproj b/builds/msvc/vs2019/libsodium/libsodium.vcxproj
index 979df2d7..dac5deb2 100644
--- a/builds/msvc/vs2019/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2019/libsodium/libsodium.vcxproj
@@ -173,6 +173,7 @@
+
@@ -198,6 +199,7 @@
+
diff --git a/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters
index 0c57629b..e13debad 100644
--- a/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters
@@ -312,6 +312,9 @@
crypto_aead\xchacha20poly1305\sodium
+
+ crypto_aead\aegis256\aesni
+
crypto_aead\aes256gcm\aesni
@@ -383,6 +386,9 @@
include\sodium
+
+ include\sodium
+
include\sodium
@@ -745,6 +751,12 @@
{a6837e41-3751-38c9-bb90-dd59d5f4af7b}
+
+ {6897a4cc-0091-3970-b712-c0ac75c16b67}
+
+
+ {53f55581-bb1c-3fe5-8c1b-1dd4243765ef}
+
{3e53394c-b59c-30cc-ae69-a4f46f9edfa3}
diff --git a/dist-build/emscripten-symbols.def b/dist-build/emscripten-symbols.def
index ab46382d..b8870183 100644
--- a/dist-build/emscripten-symbols.def
+++ b/dist-build/emscripten-symbols.def
@@ -15,6 +15,17 @@ _crypto_aead_aes256gcm_messagebytes_max 0 0
_crypto_aead_aes256gcm_npubbytes 0 0
_crypto_aead_aes256gcm_nsecbytes 0 0
_crypto_aead_aes256gcm_statebytes 0 0
+_crypto_aead_aegis256_abytes 0 0
+_crypto_aead_aegis256_decrypt 0 0
+_crypto_aead_aegis256_decrypt_detached 0 0
+_crypto_aead_aegis256_encrypt 0 0
+_crypto_aead_aegis256_encrypt_detached 0 0
+_crypto_aead_aegis256_is_available 0 0
+_crypto_aead_aegis256_keybytes 0 0
+_crypto_aead_aegis256_keygen 0 0
+_crypto_aead_aegis256_messagebytes_max 0 0
+_crypto_aead_aegis256_npubbytes 0 0
+_crypto_aead_aegis256_nsecbytes 0 0
_crypto_aead_chacha20poly1305_abytes 1 1
_crypto_aead_chacha20poly1305_decrypt 1 1
_crypto_aead_chacha20poly1305_decrypt_detached 1 1
diff --git a/libsodium.vcxproj b/libsodium.vcxproj
index 5f494086..7ddc6e5f 100644
--- a/libsodium.vcxproj
+++ b/libsodium.vcxproj
@@ -411,6 +411,7 @@
+
@@ -436,6 +437,7 @@
+
diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters
index d923d404..3ae7e702 100644
--- a/libsodium.vcxproj.filters
+++ b/libsodium.vcxproj.filters
@@ -303,6 +303,9 @@
Source Files
+
+ Source Files
+
Source Files
@@ -374,6 +377,9 @@
Header Files
+
+ Header Files
+
Header Files
diff --git a/test/symbols/all-symbols.txt b/test/symbols/all-symbols.txt
index 0615daf0..f3a5e97b 100644
--- a/test/symbols/all-symbols.txt
+++ b/test/symbols/all-symbols.txt
@@ -32,6 +32,17 @@ blake2b_long
blake2b_pick_best_implementation
blake2b_salt_personal
blake2b_update
+crypto_aead_aegis256_abytes
+crypto_aead_aegis256_decrypt
+crypto_aead_aegis256_decrypt_detached
+crypto_aead_aegis256_encrypt
+crypto_aead_aegis256_encrypt_detached
+crypto_aead_aegis256_is_available
+crypto_aead_aegis256_keybytes
+crypto_aead_aegis256_keygen
+crypto_aead_aegis256_messagebytes_max
+crypto_aead_aegis256_npubbytes
+crypto_aead_aegis256_nsecbytes
crypto_aead_aes256gcm_abytes
crypto_aead_aes256gcm_beforenm
crypto_aead_aes256gcm_decrypt