diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 4c41ce445c..d3d29e6065 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1783,6 +1783,8 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
 #define ENDL "\n"
 #endif
 
+	memset(&tm, 0, sizeof(tm));
+
 	gethostname(host, sizeof(host) - 1);
 	if (strchr(srcemail, '@'))
 		ast_copy_string(who, srcemail, sizeof(who));
@@ -2049,8 +2051,12 @@ static int get_date(char *s, int len)
 {
 	struct tm tm;
 	time_t t;
-	t = time(0);
+
+	time(&t);
+	memset(&tm, 0, sizeof(tm));
+
 	ast_localtime(&t, &tm, NULL);
+
 	return strftime(s, len, "%a %b %e %r %Z %Y", &tm);
 }