diff --git a/lib/index.js b/lib/index.js
index fc5a70d..f367a71 100755
--- a/lib/index.js
+++ b/lib/index.js
@@ -21,7 +21,7 @@ exports.base64urlEncode = function (value, encoding) {
 
     Hoek.assert(typeof value === 'string' || Buffer.isBuffer(value), 'value must be string or buffer');
     const buf = (Buffer.isBuffer(value) ? value : Buffer.from(value, encoding || 'binary'));
-    return buf.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/\=/g, '');
+    return buf.toString('base64url');
 };
 
 
@@ -39,6 +39,6 @@ exports.base64urlDecode = function (value, encoding) {
         throw new Error('Invalid character');
     }
 
-    const buf = Buffer.from(value, 'base64');
+    const buf = Buffer.from(value, 'base64url');
     return (encoding === 'buffer' ? buf : buf.toString(encoding || 'binary'));
 };