diff --git a/Cargo.toml b/Cargo.toml
index 3a8c073..66090bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ gitlab = { repository = "lumi/xmpp-rs" }
 [dependencies]
 xml-rs = "0.3.6"
 openssl = "0.9.7"
-base64 = "0.4.0"
+base64 = "0.5.2"
 minidom = "0.2.0"
 jid = "0.2.0"
 sasl = "0.3.0"
diff --git a/src/error.rs b/src/error.rs
index 036fbe9..f27e94e 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -14,7 +14,7 @@ use xml::writer::Error as EmitterError;
 
 use minidom::Error as MinidomError;
 
-use base64::Base64Error;
+use base64::DecodeError;
 
 use components::sasl_error::SaslError;
 
@@ -27,7 +27,7 @@ pub enum Error {
     HandshakeError(HandshakeError<TcpStream>),
     OpenSslErrorStack(ErrorStack),
     MinidomError(MinidomError),
-    Base64Error(Base64Error),
+    Base64Error(DecodeError),
     SaslError(Option<String>),
     XmppSaslError(SaslError),
     FormatError(FormatError),
@@ -71,8 +71,8 @@ impl From<MinidomError> for Error {
     }
 }
 
-impl From<Base64Error> for Error {
-    fn from(err: Base64Error) -> Error {
+impl From<DecodeError> for Error {
+    fn from(err: DecodeError) -> Error {
         Error::Base64Error(err)
     }
 }