diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 62680bd..0a9e803 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -150,6 +150,7 @@ lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_LOGIN) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) += pw_encrypt.o
+lib-$(CONFIG_FEATURE_FTP_AUTHENTICATION) += pw_encrypt.o
 
 lib-$(CONFIG_DF) += find_mount_point.o
 lib-$(CONFIG_MKFS_MINIX) += find_mount_point.o
diff --git a/networking/Config.src b/networking/Config.src
index fbad7ec..c5107db 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -134,6 +134,13 @@ config FEATURE_FTPD_ACCEPT_BROKEN_LIST
 	  it increases the code size by ~40 bytes.
 	  Most other ftp servers seem to behave similar to this.
 
+config FEATURE_FTP_AUTHENTICATION
+	bool "Enable authentication"
+	default n
+	depends on FTPD
+	help
+	  Enable basic system login as seen in telnet etc.
+
 config FTPGET
 	bool "ftpget"
 	default y
diff --git a/networking/ftpd.c b/networking/ftpd.c
index 2d2a3a4..6bf0f00 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -1061,6 +1061,47 @@ cmdio_get_cmd_and_arg(void)
 	return cmdval;
 }
 
+#if ENABLE_FEATURE_FTP_AUTHENTICATION
+/*
+ * This is almost the bb function "ask_and_check_password_extended". Almost.
+ */
+static int check_password(const struct passwd *pw, const char* unencrypted_pass)
+{
+	char *encrypted;
+	const char *correct;
+	int r;
+	/* fake salt. crypt() can choke otherwise. */
+	correct = "aa";
+	if (!pw) {
+		/* "aa" will never match */
+		goto fake_it;
+	}
+	correct = pw->pw_passwd;
+#if ENABLE_FEATURE_SHADOWPASSWDS
+	/* Using _r function to avoid pulling in static buffers */
+	if ((correct[0] == 'x' || correct[0] == '*') && !correct[1]) {
+		struct spwd spw;
+		char buffer[256];
+		/* getspnam_r may return 0 yet set result to NULL.
+		 * At least glibc 2.4 does this. Be extra paranoid here. */
+		struct spwd *result = NULL;
+		r = getspnam_r(pw->pw_name, &spw, buffer, sizeof(buffer), &result);
+		correct = (r || !result) ? "aa" : result->sp_pwdp;
+	}
+#endif
+
+	if (!correct[0]) /* empty password field? */
+		return 1;
+
+ fake_it:
+	encrypted = pw_encrypt(unencrypted_pass, correct, 1);
+	r = (strcmp(encrypted, correct) == 0);
+	free(encrypted);
+	return r;
+}
+
+#endif
+
 #define mk_const4(a,b,c,d) (((a * 0x100 + b) * 0x100 + c) * 0x100 + d)
 #define mk_const3(a,b,c)    ((a * 0x100 + b) * 0x100 + c)
 enum {
@@ -1199,23 +1240,25 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
 	WRITE_OK(FTP_GREET);
 	signal(SIGALRM, timeout_handler);
 
-#ifdef IF_WE_WANT_TO_REQUIRE_LOGIN
+#if ENABLE_FEATURE_FTP_AUTHENTICATION
 	{
-		smallint user_was_specified = 0;
+		struct passwd *p = NULL;
+
 		while (1) {
 			uint32_t cmdval = cmdio_get_cmd_and_arg();
 
 			if (cmdval == const_USER) {
-				if (G.ftp_arg == NULL || strcasecmp(G.ftp_arg, "anonymous") != 0)
-					cmdio_write_raw(STR(FTP_LOGINERR)" Server is anonymous only\r\n");
-				else {
-					user_was_specified = 1;
-					cmdio_write_raw(STR(FTP_GIVEPWORD)" Please specify the password\r\n");
-				}
+
+				p = getpwnam(G.ftp_arg);
+				cmdio_write_raw(STR(FTP_GIVEPWORD)" Please specify the password\r\n");
+
 			} else if (cmdval == const_PASS) {
-				if (user_was_specified)
-					break;
-				cmdio_write_raw(STR(FTP_NEEDUSER)" Login with USER\r\n");
+				if( check_password(p, G.ftp_arg) > 0 ) {
+					break;	/* login success */
+				} else {
+					cmdio_write_raw(STR(FTP_LOGINERR)" Login failed\r\n");
+					p = NULL;
+				}
 			} else if (cmdval == const_QUIT) {
 				WRITE_OK(FTP_GOODBYE);
 				return 0;