diff --git a/funcs/func_base64.c b/funcs/func_base64.c
index 0849e95396..b44e695da9 100644
--- a/funcs/func_base64.c
+++ b/funcs/func_base64.c
@@ -46,12 +46,19 @@ static int base64_encode(struct ast_channel *chan, const char *cmd, char *data,
 static int base64_decode(struct ast_channel *chan, const char *cmd, char *data,
 			 char *buf, size_t len)
 {
+	int decoded_len;
+
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "Syntax: BASE64_DECODE(<base_64 string>) - missing argument!\n");
 		return -1;
 	}
 
-	ast_base64decode((unsigned char *) buf, data, len);
+	decoded_len = ast_base64decode((unsigned char *) buf, data, len);
+	if (decoded_len <= (len - 1)) {		/* if not truncated, */
+		buf[decoded_len] = '\0';
+	} else {
+		buf[len - 1] = '\0';
+	}
 
 	return 0;
 }
diff --git a/main/utils.c b/main/utils.c
index d5d1bb0d2f..f55fe42714 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -264,7 +264,7 @@ int ast_base64decode(unsigned char *dst, const char *src, int max)
 	unsigned int byte = 0;
 	unsigned int bits = 0;
 	int incnt = 0;
-	while (*src && (cnt < max)) {
+	while(*src && *src != '=' && (cnt < max)) {
 		/* Shift in 6 bits of input */
 		byte <<= 6;
 		byte |= (b2a[(int)(*src)]) & 0x3f;