diff --git a/scapy/all.py b/scapy/all.py
index fbaf017c91c746b146e87a99ca8e7ef5b380f2a3..f6cf00eca839d1459b97df485e0ab394bf5ddffa 100644
--- a/scapy/all.py
+++ b/scapy/all.py
@@ -40,4 +40,4 @@ from asn1.asn1 import *
 from asn1.ber import *
 from asn1.mib import *
 
-from crypto.cert import *
+from crypto import *
diff --git a/scapy/crypto/__init__.py b/scapy/crypto/__init__.py
index 0fdc3e489b5afd6594b6fb1ce28a9be633ea6c16..a29ecf8da77e55ce98073d5bfe6859c5466f625b 100644
--- a/scapy/crypto/__init__.py
+++ b/scapy/crypto/__init__.py
@@ -3,4 +3,13 @@
 ## Copyright (C) Arnaud Ebalard <arno@natisbad.org>
 ## This program is published under a GPLv2 license
 
-__all__ = ["cert"]
+
+
+try:
+    import Crypto
+except ImportError:
+    import logging
+    log_loading = logging.getLogger("scapy.loading")
+    log_loading.info("Can't import python Crypto lib. Disabled certificate manipulation tools")
+else:
+    from scapy.crypto.cert import *