diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index 237287643..8b80336ac 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -39,7 +39,6 @@ CPPDEFINES_MOD += [
 SOURCE_MOD += [
     'embed/extmod/modtrezorcrypto/modtrezorcrypto.c',
     'embed/extmod/modtrezorcrypto/crc.c',
-    'embed/extmod/modtrezorcrypto/shamir.c',
     'embed/extmod/modtrezorcrypto/rand.c',
     'vendor/trezor-crypto/address.c',
     'vendor/trezor-crypto/aes/aescrypt.c',
@@ -85,6 +84,7 @@ SOURCE_MOD += [
     'vendor/trezor-crypto/secp256k1.c',
     'vendor/trezor-crypto/sha2.c',
     'vendor/trezor-crypto/sha3.c',
+    'vendor/trezor-crypto/shamir.c',
 ]
 
 # libsecp256k1-zkp
diff --git a/core/SConscript.unix b/core/SConscript.unix
index 6486c063c..35caf94c9 100644
--- a/core/SConscript.unix
+++ b/core/SConscript.unix
@@ -37,7 +37,6 @@ CPPDEFINES_MOD += [
 SOURCE_MOD += [
     'embed/extmod/modtrezorcrypto/modtrezorcrypto.c',
     'embed/extmod/modtrezorcrypto/crc.c',
-    'embed/extmod/modtrezorcrypto/shamir.c',
     'vendor/trezor-crypto/address.c',
     'vendor/trezor-crypto/aes/aescrypt.c',
     'vendor/trezor-crypto/aes/aeskey.c',
@@ -81,6 +80,7 @@ SOURCE_MOD += [
     'vendor/trezor-crypto/secp256k1.c',
     'vendor/trezor-crypto/sha2.c',
     'vendor/trezor-crypto/sha3.c',
+    'vendor/trezor-crypto/shamir.c',
     'vendor/trezor-crypto/nem.c',
 ]
 
diff --git a/core/embed/extmod/modtrezorcrypto/shamir.c b/crypto/shamir.c
similarity index 100%
rename from core/embed/extmod/modtrezorcrypto/shamir.c
rename to crypto/shamir.c
diff --git a/core/embed/extmod/modtrezorcrypto/shamir.h b/crypto/shamir.h
similarity index 100%
rename from core/embed/extmod/modtrezorcrypto/shamir.h
rename to crypto/shamir.h