diff --git a/src/claims.rs b/src/claims.rs
index f123ce5..40d559f 100644
--- a/src/claims.rs
+++ b/src/claims.rs
@@ -1,4 +1,4 @@
-use base64::{decode, encode_config, URL_SAFE};
+use base64::{decode_config, encode_config, URL_SAFE};
 use Component;
 use error::Error;
 use serde::{Deserialize, Serialize};
@@ -33,7 +33,7 @@ impl<T: Serialize + Deserialize> Claims<T>{
 
 impl<T: Serialize + Deserialize> Component for Claims<T> {
     fn from_base64(raw: &str) -> Result<Claims<T>, Error> {
-        let data = try!(decode(raw));
+        let data = try!(decode_config(raw, URL_SAFE));
         let reg_claims: Registered = try!(serde_json::from_slice(&data));
 
         let pri_claims: T = try!(serde_json::from_slice(&data));
diff --git a/src/crypt.rs b/src/crypt.rs
index 6a117cf..570305b 100644
--- a/src/crypt.rs
+++ b/src/crypt.rs
@@ -1,4 +1,4 @@
-use base64::{decode, encode_config, URL_SAFE};
+use base64::{decode_config, encode_config, URL_SAFE};
 use openssl::hash::MessageDigest;
 use openssl::memcmp;
 use openssl::pkey::PKey;
@@ -26,7 +26,7 @@ pub fn sign_rsa(data: &str, key: &[u8], digest: MessageDigest) -> String {
 }
 
 pub fn verify(target: &str, data: &str, key: &[u8], digest: MessageDigest) -> bool {
-    let target_bytes: Vec<u8> = decode(target).unwrap();
+    let target_bytes: Vec<u8> = decode_config(target, URL_SAFE).unwrap();
     let secret_key = PKey::hmac(key).unwrap();
 
     let mut signer = Signer::new(digest, &secret_key).unwrap();
@@ -38,7 +38,7 @@ pub fn verify(target: &str, data: &str, key: &[u8], digest: MessageDigest) -> bo
 }
 
 pub fn verify_rsa(signature: &str, data: &str, key: &[u8], digest: MessageDigest) -> bool {
-    let signature_bytes: Vec<u8> = decode(signature).unwrap();
+    let signature_bytes: Vec<u8> = decode_config(signature, URL_SAFE).unwrap();
     let public_key = Rsa::public_key_from_pem(key).unwrap();
     let pkey = PKey::from_rsa(public_key).unwrap();
     let mut verifier = Verifier::new(digest, &pkey).unwrap();
diff --git a/src/lib.rs b/src/lib.rs
index 1fa0d15..d0e1a38 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,7 @@ extern crate serde;
 extern crate serde_derive;
 extern crate serde_json;
 
-use base64::{decode, encode_config, URL_SAFE};
+use base64::{decode_config, encode_config, URL_SAFE};
 use openssl::hash::MessageDigest;
 use serde::{Serialize, Deserialize};
 pub use error::Error;
@@ -41,7 +41,7 @@ impl<T> Component for T
 
     /// Parse from a string.
     fn from_base64(raw: &str) -> Result<T, Error> {
-        let data = try!(decode(raw));
+        let data = try!(decode_config(raw, URL_SAFE));
         let s = try!(String::from_utf8(data));
         Ok(try!(serde_json::from_str(&*s)))
     }