diff --git a/appl/telnet/Makefile.in b/appl/telnet/Makefile.in
index 0c5c14f62..bddc4ab08 100644
--- a/appl/telnet/Makefile.in
+++ b/appl/telnet/Makefile.in
@@ -21,6 +21,10 @@ all: stamp-configure
 	for i in $(SUBDIRS); \
 	do (cd $$i; $(MAKE) $(MFLAGS) all); done
 
+install:
+	for i in $(SUBDIRS); \
+	do (cd $$i; $(MAKE) $(MFLAGS) install); done
+
 stamp-configure:
 	@echo "Configuring directory appl/telnet"
 	$(srcdir)/configure && touch stamp-configure
diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in
index ce20863c9..e46f9b946 100644
--- a/appl/telnet/telnet/Makefile.in
+++ b/appl/telnet/telnet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in,v 1.2 1994/05/13 05:02:46 assar Exp
+# $Id$
 
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -9,8 +9,11 @@ CC = @CC@
 AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@
-CFLAGS = @CFLAGS@ -I/usr/athena/include -I.. -I$(VPATH)/..
+CFLAGS = @CFLAGS@
 LIBS = @LIBS@
+INSTALL = @INSTALL@
+
+PROGS = telnet
 
 prefix = @prefix@
 exec_prefix = $(prefix)
@@ -23,14 +26,23 @@ SOURCES=commands.c main.c network.c ring.c \
 OBJECTS=authenc.o commands.o main.o network.o ring.o sys_bsd.o \
 	telnet.o terminal.o utilities.o ${GETOPT_OBJ}
 
-KLIB=-L/usr/athena/lib -lkrb -ldes
+libtop=../../../lib
+
+KLIB=$(libtop)/krb/libkrb.a $(libtop)/des/libdes.a
 
 
 all: telnet
 
+.c.o:
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) \
+	-I../../../include -I$(srcdir)/../../../include -I.. -I$(srcdir)/.. $<
+
 telnet: $(OBJECTS)
 	$(CC) -o telnet $(OBJECTS) $(LIBS) ../libtelnet/libtelnet.a $(KLIB)
 
+install: all
+	$(INSTALL) -d $(prefix)/bin
+	$(INSTALL) $(PROGS) $(prefix)/bin
 
 clean cleandir:
 	rm -f *.o *.a telnet \#* *~ core
diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in
index 537f61a46..e01c23b83 100644
--- a/appl/telnet/telnetd/Makefile.in
+++ b/appl/telnet/telnetd/Makefile.in
@@ -9,13 +9,16 @@ CC = @CC@
 AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@
-CFLAGS = @CFLAGS@ -I/usr/athena/include -I.. -I$(VPATH)/..
+CFLAGS = @CFLAGS@
 LIBS = @LIBS@
+INSTALL = @INSTALL@
 
 prefix = @prefix@
 exec_prefix = $(prefix)
 libdir = $(exec_prefix)/lib
 
+PROGS = telnetd
+
 SOURCES=telnetd.c state.c termstat.c slc.c sys_term.c \
 	utility.c global.c authenc.c
 
@@ -24,16 +27,25 @@ OBJECTS=telnetd.o state.o termstat.o slc.o sys_term.o \
 	utility.o global.o authenc.o
 
 
-libtop=/usr/athena/lib
+libtop=../../../lib
 
 KLIB=$(libtop)/kafs/libkafs.a $(libtop)/krb/libkrb.a $(libtop)/des/libdes.a
 
 
 all: telnetd
 
+$(OBJECTS): ../config.h
+
+.c.o:
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) \
+	-I../../../include -I$(srcdir)/../../../include -I.. -I$(srcdir)/.. $<
+
 telnetd: $(OBJECTS)
 	$(CC) -o telnetd $(OBJECTS) $(LIBS) ../libtelnet/libtelnet.a $(KLIB)
 
+install: all
+	$(INSTALL) -d $(prefix)/libexec
+	$(INSTALL) $(PROGS) $(prefix)/libexec
 
 clean cleandir:
 	rm -f *.o *.a telnetd \#* *~ core