diff --git a/appl/telnet/acconfig.h b/appl/telnet/acconfig.h
index 4f5b36a2a..978337c74 100644
--- a/appl/telnet/acconfig.h
+++ b/appl/telnet/acconfig.h
@@ -75,7 +75,7 @@
 
 /* set this to a sensible login */
 #ifndef LOGIN_PATH
-#define LOGIN_PATH "/usr/athena/bin/login"
+#define LOGIN_PATH BINDIR "/login"
 #endif
 
 #endif /* T_CONFIG_H */
diff --git a/appl/telnet/config.h.in b/appl/telnet/config.h.in
index 9626454fa..4ec043df8 100644
--- a/appl/telnet/config.h.in
+++ b/appl/telnet/config.h.in
@@ -162,7 +162,7 @@
 
 /* set this to a sensible login */
 #ifndef LOGIN_PATH
-#define LOGIN_PATH "/usr/athena/bin/login"
+#define LOGIN_PATH BINDIR "/login"
 #endif
 
 #endif /* T_CONFIG_H */
diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in
index 1d504dc60..8527b6617 100644
--- a/appl/telnet/telnetd/Makefile.in
+++ b/appl/telnet/telnetd/Makefile.in
@@ -9,7 +9,7 @@ SHELL		= /bin/sh
 CC = @CC@
 AR = ar
 RANLIB = @RANLIB@
-DEFS = @DEFS@
+DEFS = @DEFS@ -DBINDIR='"$(bindir)"'
 CFLAGS = @CFLAGS@
 LD_FLAGS = @LD_FLAGS@
 LIBS = @LIBS@
@@ -19,6 +19,7 @@ MKDIRHIER = @top_srcdir@/../../mkdirhier-sh
 prefix = @prefix@
 exec_prefix = $(prefix)
 libdir = $(exec_prefix)/lib
+bindir = $(exec_prefix)/bin
 
 PROGS = telnetd