diff --git a/appl/ftp/ftpd/ftpcmd.y b/appl/ftp/ftpd/ftpcmd.y
index 54ecba208..a53a9c02f 100644
--- a/appl/ftp/ftpd/ftpcmd.y
+++ b/appl/ftp/ftpd/ftpcmd.y
@@ -985,10 +985,10 @@ lookup(struct tab *p, char *cmd)
 }
 
 /*
- * getline - a hacked up version of fgets to ignore TELNET escape codes.
+ * ftpd_getline - a hacked up version of fgets to ignore TELNET escape codes.
  */
 char *
-getline(char *s, int n)
+ftpd_getline(char *s, int n)
 {
 	int c;
 	char *cs;
@@ -1089,7 +1089,7 @@ yylex(void)
 		case CMD:
 			signal(SIGALRM, toolong);
 			alarm((unsigned) ftpd_timeout);
-			if (getline(cbuf, sizeof(cbuf)-1) == NULL) {
+			if (ftpd_getline(cbuf, sizeof(cbuf)-1) == NULL) {
 				reply(221, "You could at least say goodbye.");
 				dologout(0);
 			}
diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c
index 3441d8ddc..1ae44b3b7 100644
--- a/appl/ftp/ftpd/ftpd.c
+++ b/appl/ftp/ftpd/ftpd.c
@@ -1736,7 +1736,7 @@ myoob(int signo)
 
 #if 0 
 	cp = tmpline;
-	if (getline(cp, 7) == NULL) {
+	if (ftpd_getline(cp, 7) == NULL) {
 		reply(221, "You could at least say goodbye.");
 		dologout(0);
 	}