diff --git a/Cargo.toml b/Cargo.toml
index 736ce2b..c6dcff0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,6 @@ serde = "0.9"
 rmp-serde = "0.12"
 serde_yaml = "0.6"
 serde_utils = "0.5.1"
-rust-crypto = "0.2"
 squash-sys = "0.9"
 mmap = "*"
 quick-error = "1.1"
diff --git a/src/bundle.rs b/src/bundle.rs
index 16165ff..35742f0 100644
--- a/src/bundle.rs
+++ b/src/bundle.rs
@@ -42,7 +42,7 @@ impl BundleId {
     fn to_string(&self) -> String {
         let mut buf = String::with_capacity(self.0.len()*2);
         for b in &self.0 {
-            write!(&mut buf, "{:2x}", b).unwrap()
+            write!(&mut buf, "{:02x}", b).unwrap()
         }
         buf
     }
@@ -92,7 +92,7 @@ impl Default for BundleHeader {
             id: BundleId(vec![]),
             compression: None,
             encryption: None,
-            checksum: (ChecksumType::Sha3_256, ByteBuf::new()),
+            checksum: (ChecksumType::Blake2_256, ByteBuf::new()),
             raw_size: 0,
             encoded_size: 0,
             chunk_count: 0,
diff --git a/src/main.rs b/src/main.rs
index d9c8f58..fd39df4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,6 @@
 extern crate serde;
 extern crate rmp_serde;
 #[macro_use] extern crate serde_utils;
-extern crate crypto;
 extern crate squash_sys as squash;
 extern crate mmap;
 extern crate blake2_rfc as blake2;
@@ -34,10 +33,10 @@ fn main() {
         Repository::open(path).unwrap()
     } else {
         Repository::create(path, Config {
-            bundle_size: 1024*1024,
-            checksum: ChecksumType::Sha3_256,
+            bundle_size: 25*1024*1024,
+            checksum: ChecksumType::Blake2_256,
             chunker: ChunkerType::FastCdc((8*1024, 0)),
-            compression: Some(Compression::Brotli(5)),
+            compression: Some(Compression::Brotli(1)),
             hash: HashMethod::Blake2
         }).unwrap()
     };
diff --git a/src/repository/config.rs b/src/repository/config.rs
index 63ae7ce..c122016 100644
--- a/src/repository/config.rs
+++ b/src/repository/config.rs
@@ -119,7 +119,7 @@ impl Default for ConfigYaml {
             compression: Some(CompressionYaml { codec: "brotli".to_string(), level: Some(5) }),
             bundle_size: 25*1024*1024,
             chunker: ChunkerYaml::default(),
-            checksum: "sha3-256".to_string(),
+            checksum: "blake2_256".to_string(),
             hash: "blake2".to_string()
         }
     }
diff --git a/src/util/checksum.rs b/src/util/checksum.rs
index a96529e..213d3b4 100644
--- a/src/util/checksum.rs
+++ b/src/util/checksum.rs
@@ -1,22 +1,21 @@
 use serde::bytes::ByteBuf;
-use crypto::sha3;
-use crypto::digest::Digest;
 
+use blake2::blake2b::Blake2b;
 
 #[derive(Clone, Debug, Copy)]
 #[allow(non_camel_case_types)]
 pub enum ChecksumType {
-    Sha3_256
+    Blake2_256
 }
 serde_impl!(ChecksumType(u64) {
-    Sha3_256 => 1
+    Blake2_256 => 1
 });
 
 impl ChecksumType {
     #[inline]
     pub fn from(name: &str) -> Result<Self, &'static str> {
         match name {
-            "sha3-256" => Ok(ChecksumType::Sha3_256),
+            "blake2_256" => Ok(ChecksumType::Blake2_256),
             _ => Err("Unsupported checksum type")
         }
     }
@@ -24,7 +23,7 @@ impl ChecksumType {
     #[inline]
     pub fn name(&self) -> &'static str {
         match *self {
-            ChecksumType::Sha3_256 => "sha3-256",
+            ChecksumType::Blake2_256 => "blake2_256",
         }
     }
 }
@@ -34,32 +33,31 @@ pub type Checksum = (ChecksumType, ByteBuf);
 
 #[allow(non_camel_case_types, unknown_lints, large_enum_variant)]
 pub enum ChecksumCreator {
-    Sha3_256(sha3::Sha3)
+    Blake2_256(Blake2b)
 }
 
 impl ChecksumCreator {
     #[inline]
     pub fn new(type_: ChecksumType) -> Self {
         match type_ {
-            ChecksumType::Sha3_256 => ChecksumCreator::Sha3_256(sha3::Sha3::sha3_256())
+            ChecksumType::Blake2_256 => ChecksumCreator::Blake2_256(Blake2b::new(32))
         }
     }
 
     #[inline]
     pub fn update(&mut self, data: &[u8]) {
         match *self {
-            ChecksumCreator::Sha3_256(ref mut state) => state.input(data)
+            ChecksumCreator::Blake2_256(ref mut state) => state.update(data)
         }
     }
 
     #[inline]
     pub fn finish(self) -> Checksum {
         match self {
-            ChecksumCreator::Sha3_256(mut state) => {
-                let mut buf = Vec::with_capacity(state.output_bytes());
-                buf.resize(state.output_bytes(), 0);
-                state.result(&mut buf);
-                (ChecksumType::Sha3_256, buf.into())
+            ChecksumCreator::Blake2_256(state) => {
+                let mut buf = Vec::with_capacity(32);
+                buf.extend_from_slice(state.finalize().as_bytes());
+                (ChecksumType::Blake2_256, buf.into())
             }
         }
     }