diff --git a/src/libextra/sha1.rs b/src/libextra/crypto/sha1.rs
similarity index 100%
rename from src/libextra/sha1.rs
rename to src/libextra/crypto/sha1.rs
diff --git a/src/libextra/std.rc b/src/libextra/std.rc
index d4c85ef51362..98305e2766a0 100644
--- a/src/libextra/std.rc
+++ b/src/libextra/std.rc
@@ -86,13 +86,16 @@ pub mod sort;
 pub mod dlist;
 pub mod treemap;
 
+// Crypto
+#[path="crypto/sha1.rs"]
+pub mod sha1;
+
 // And ... other stuff
 
 pub mod ebml;
 pub mod dbg;
 pub mod getopts;
 pub mod json;
-pub mod sha1;
 pub mod md4;
 pub mod tempfile;
 pub mod term;