diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 90a2b2a0b67f..c0f968aa441a 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -5,7 +5,7 @@ LIB=		fetch
 CFLAGS+=	-I. -Wall -pedantic
 CFLAGS+=	-DINET6
 .if !defined(DEBUG)
-CFLAGS+=	-DNDEBUG
+#CFLAGS+=	-DNDEBUG
 .endif
 SRCS=		fetch.c common.c ftp.c http.c file.c \
 		ftperr.h httperr.h
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index da4f7ce03471..0be1d0d65ed6 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -74,8 +74,7 @@
 #include "common.h"
 #include "ftperr.h"
 
-#define FTP_ANONYMOUS_USER	"ftp"
-#define FTP_ANONYMOUS_PASSWORD	"ftp"
+#define FTP_ANONYMOUS_USER	"anonymous"
 
 #define FTP_CONNECTION_ALREADY_OPEN	125
 #define FTP_OPEN_DATA_CONNECTION	150
@@ -779,7 +778,7 @@ _ftp_connect(struct url *url, struct url *purl, char *flags)
 	    pwd = getenv("FTP_PASSWORD");
 	if (!pwd || !*pwd) {
 	    if ((logname = getlogin()) == 0)
-		logname = FTP_ANONYMOUS_PASSWORD;
+		logname = FTP_ANONYMOUS_USER;
 	    gethostname(localhost, sizeof localhost);
 	    snprintf(pbuf, sizeof pbuf, "%s@%s", logname, localhost);
 	    pwd = pbuf;