diff --git a/logging.c b/logging.c
index f4daf6e65..7f03c7719 100644
--- a/logging.c
+++ b/logging.c
@@ -413,7 +413,7 @@ static void send_mail()
     char *mailer;
     char *subject = MAILSUBJECT;
     int fd[2];
-    char buf[MAXLOGLEN + 1024];
+    char buf[MAXLOGLEN + BUFSIZ];
 #ifdef POSIX_SIGNALS
     struct sigaction action;
 
diff --git a/parse.yacc b/parse.yacc
index 3bffe7e72..294105d8f 100644
--- a/parse.yacc
+++ b/parse.yacc
@@ -300,7 +300,7 @@ user		:	NAME {
 
 typedef struct {
     int type;
-    char name[1024];
+    char name[BUFSIZ];
 } aliasinfo;
 
 #define MOREALIASES (32)