diff --git a/CHANGES b/CHANGES
index 7c00812cf2bb98b74c0a7ed2834f4564be9cf9ac..f0d19f05aa77759620b982343c521dc9be2bf77e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,15 @@
 
                                   Changelog
 
+Daniel (11 August 2004)
+- configure now defines _XOPEN_SOURCE to 500 on systems that need it to build
+  warning-free (the only known one so far is non-gcc builds on 64bit SGI
+  IRIX).
+
+- the FTP code now includes the server response in the error message when the
+  server gives back a 530 after the password is provided, as it isn't
+  necessary because of a bad user name or password.
+
 Version 7.12.1 (10 August 2004)
 
 Daniel (10 August 2004)
diff --git a/lib/ftp.c b/lib/ftp.c
index fb99243e77d412825d04d80ba0281975cc598666..67d6ddacb134f300da5effe42b7a6e7cd425c2f7 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -592,8 +592,11 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
 
     if(ftpcode == 530) {
       /* 530 Login incorrect.
-         (the username and/or the password are incorrect) */
-      failf(data, "the username and/or the password are incorrect");
+         (the username and/or the password are incorrect)
+      or
+         530 Sorry, the maximum number of allowed users are already connected
+      */
+      failf(data, "not logged in: %s", &buf[4]);
       return CURLE_FTP_USER_PASSWORD_INCORRECT;
     }
     else if(ftpcode == 230) {