diff --git a/Makefile.include b/Makefile.include
index 7e71499fd..524f62229 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -48,6 +48,7 @@ CFLAGS   += $(OPTFLAGS) \
             -I$(TOP_DIR) \
             -I$(TOP_DIR)gen \
             -I$(TOP_DIR)vendor/trezor-crypto \
+            -I$(TOP_DIR)vendor/trezor-crypto/aes \
             -I$(TOP_DIR)vendor/trezor-crypto/ed25519-donna \
             -I$(TOP_DIR)vendor/trezor-qrenc
 
diff --git a/firmware/Makefile b/firmware/Makefile
index 1638b857b..88fe99fec 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -38,10 +38,10 @@ OBJS += ../vendor/trezor-crypto/ripemd160.o
 OBJS += ../vendor/trezor-crypto/sha2.o
 OBJS += ../vendor/trezor-crypto/sha3.o
 
-OBJS += ../vendor/trezor-crypto/aescrypt.o
-OBJS += ../vendor/trezor-crypto/aeskey.o
-OBJS += ../vendor/trezor-crypto/aestab.o
-OBJS += ../vendor/trezor-crypto/aes_modes.o
+OBJS += ../vendor/trezor-crypto/aes/aescrypt.o
+OBJS += ../vendor/trezor-crypto/aes/aeskey.o
+OBJS += ../vendor/trezor-crypto/aes/aestab.o
+OBJS += ../vendor/trezor-crypto/aes/aes_modes.o
 
 OBJS += ../vendor/trezor-qrenc/qr_encode.o
 
diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto
index fa82ba6d3..ea227fd80 160000
--- a/vendor/trezor-crypto
+++ b/vendor/trezor-crypto
@@ -1 +1 @@
-Subproject commit fa82ba6d3f4ca9bbfee0c3dd7f8da22a8bfc6f11
+Subproject commit ea227fd805fb97aa2fa76a89bfd05d44012d153f