diff --git a/CHANGES b/CHANGES
index b9012dd36..70f9bcb6c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel (22 September 2004)
+- Jean-Claude Chauve fixed an LDAP crash when more than one record was
+  retrieved.
+
 Daniel (19 September 2004)
 - Andreas Rieke pointed out that when attempting to connect to a host without
   a service on the specified port, curl_easy_perform() didn't properly provide
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d48bdafbd..b6a3c51e8 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,7 +15,8 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
- o connect failures properly writes error message in errorbuffer
+ o LDAP crash when more than one record was received
+ o connect failures properly stores an error message in the errorbuffer
  o Rare Location:-following problem with bad original URL
  o -F can now add Content-Type on non-file sections
  o double Host: header when following Location: with replaced Host: fixed
diff --git a/lib/ldap.c b/lib/ldap.c
index 44029503f..27bccdc7c 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -350,8 +350,8 @@ CURLcode Curl_ldap(struct connectdata *conn)
       Curl_client_write(data, CLIENTWRITE_BODY, (char *)"\n", 1);
 
       (*ldap_memfree)(attribute);
-      (*ldap_memfree)(dn);
     }
+    (*ldap_memfree)(dn);
     if (ber)
        (*ber_free)(ber, 0);
   }