diff --git a/ChangeLog b/ChangeLog
index ad9213eac..943c75491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,10 @@
    - deraadt@cvs.openbsd.org 2006/03/19 18:53:12
      [kex.h myproposal.h]
      spacing
+   - djm@cvs.openbsd.org 2006/03/20 04:07:22
+     [auth2-gss.c]
+     GSSAPI related leaks detected by Coverity via elad AT netbsd.org;
+     reviewed by simon AT sxw.org.uk; deraadt@ ok
 
 20060318
  - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
@@ -4224,4 +4228,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.4233 2006/03/25 13:04:32 djm Exp $
+$Id: ChangeLog,v 1.4234 2006/03/25 13:04:53 djm Exp $
diff --git a/auth2-gss.c b/auth2-gss.c
index 95844a05e..bbb6db964 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth2-gss.c,v 1.12 2005/10/13 22:24:31 stevesk Exp $	*/
+/*	$OpenBSD: auth2-gss.c,v 1.13 2006/03/20 04:07:22 djm Exp $	*/
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -100,6 +100,8 @@ userauth_gssapi(Authctxt *authctxt)
 	}
 
 	if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
+		if (ctxt != NULL)
+			ssh_gssapi_delete_ctx(&ctxt);
 		xfree(doid);
 		return (0);
 	}