diff --git a/ChangeLog b/ChangeLog
index 59ac3ad54..61bf3b852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20060318
+- (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
+  elad AT NetBSD.org
+
 20060316
  - (dtucker) [entropy.c] Add headers for WIFEXITED and friends.
  - (dtucker) [configure.ac md-sha256.c] NetBSD has sha2.h in
@@ -4182,4 +4186,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4228 2006/03/16 07:22:18 djm Exp $
+$Id: ChangeLog,v 1.4229 2006/03/18 12:04:49 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 49cf32369..2d975c394 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -47,7 +47,7 @@
 
 /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
 #include "includes.h"
-RCSID("$Id: auth-pam.c,v 1.129 2006/03/15 03:42:55 djm Exp $");
+RCSID("$Id: auth-pam.c,v 1.130 2006/03/18 12:04:49 djm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -729,6 +729,7 @@ sshpam_query(void *ctx, char **name, char **info,
 				*num = 0;
 				**echo_on = 0;
 				ctxt->pam_done = -1;
+				xfree(msg);
 				return 0;
 			}
 			/* FALLTHROUGH */