diff --git a/src/ecaps2.rs b/src/ecaps2.rs
index 68012d960f117c88effb9d998476e9e6d6b45d81..fce5e6ea8ccabfc869e497d69f26bb9e13a74a48 100644
--- a/src/ecaps2.rs
+++ b/src/ecaps2.rs
@@ -1,7 +1,6 @@
 extern crate sha2;
 extern crate sha3;
 extern crate blake2;
-extern crate base64;
 
 use disco::{Feature, Identity, Disco};
 use data_forms::DataForm;
@@ -9,6 +8,7 @@ use data_forms::DataForm;
 use self::sha2::{Sha256, Sha512, Digest};
 use self::sha3::{Sha3_256, Sha3_512};
 use self::blake2::Blake2b;
+use base64;
 
 fn compute_item(field: &str) -> Vec<u8> {
     let mut bytes = field.as_bytes().to_vec();
diff --git a/src/error.rs b/src/error.rs
index bd7d2d9cb78de8139f056e49809df24309f4e63c..c55a52a1d153b045c0d7c31e92ff1ad72a29a462 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,13 +1,15 @@
 use std::convert::From;
 use std::io;
 
+use base64;
 use minidom;
 
 #[derive(Debug)]
 pub enum Error {
+    ParseError(&'static str),
     IoError(io::Error),
     XMLError(minidom::Error),
-    ParseError(&'static str),
+    Base64Error(base64::Base64Error),
 }
 
 impl From<io::Error> for Error {
@@ -21,3 +23,9 @@ impl From<minidom::Error> for Error {
         Error::XMLError(err)
     }
 }
+
+impl From<base64::Base64Error> for Error {
+    fn from(err: base64::Base64Error) -> Error {
+        Error::Base64Error(err)
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index c9315f6e5092d62d02de55f631cfde6796b43757..50679604da619fc2f1a8a3c72aa58711e5f270da 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,6 +8,7 @@
 //! before being sent over the wire.
 
 extern crate minidom;
+extern crate base64;
 use minidom::Element;
 
 /// Error type returned by every parser on failure.