diff --git a/client/Makefile b/client/Makefile
index f33c5235..0cb052e0 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -108,7 +108,7 @@ CMDSRCS = 	$(SRC_SMARTCARD) \
 			crapto1/crapto1.c\
 			crapto1/crypto1.c\
 			polarssl/des.c\
-			polarssl/libpcrypto.c\
+			crypto/libpcrypto.c\
 			cliparser/argtable3.c\
 			cliparser/cliparser.c\
 			mfkey.c\
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 1ff24eb1..1e5bbe1a 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -24,7 +24,7 @@
 #include "mifare.h"
 #include "mifare4.h"
 #include "cliparser/cliparser.h"
-#include "polarssl/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 
 static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
diff --git a/common/polarssl/libpcrypto.c b/client/crypto/libpcrypto.c
similarity index 99%
rename from common/polarssl/libpcrypto.c
rename to client/crypto/libpcrypto.c
index d05c18c1..11713251 100644
--- a/common/polarssl/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -9,7 +9,7 @@
 // crypto commands
 //-----------------------------------------------------------------------------
 
-#include "polarssl/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/common/polarssl/libpcrypto.h b/client/crypto/libpcrypto.h
similarity index 100%
rename from common/polarssl/libpcrypto.h
rename to client/crypto/libpcrypto.h
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index 8f6bcfe6..1d5891fe 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -30,7 +30,7 @@
 #include "sda_test.h"
 #include "dda_test.h"
 #include "cda_test.h"
-#include "libpcrypto.h"
+#include "crypto/libpcrypto.h"
 
 int ExecuteCryptoTests(bool verbose) {
 	int res;
diff --git a/client/mifare4.c b/client/mifare4.c
index 866e854f..069c54d4 100644
--- a/client/mifare4.c
+++ b/client/mifare4.c
@@ -15,7 +15,7 @@
 #include "cmdhf14a.h"
 #include "util.h"
 #include "ui.h"
-#include "polarssl/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 
 int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
 	memcpy(&iv[0], session->TI, 4);
diff --git a/client/obj/crypto/.dummy b/client/obj/crypto/.dummy
new file mode 100644
index 00000000..e69de29b