diff --git a/appl/ftp/Makefile.in b/appl/ftp/Makefile.in
index 48da6c942..86a39b177 100644
--- a/appl/ftp/Makefile.in
+++ b/appl/ftp/Makefile.in
@@ -27,6 +27,10 @@ install: all
 	for i in $(SUBDIRS); \
 	do (cd $$i && $(MAKE) $(MFLAGS) install); done
 
+uninstall:
+	for i in $(SUBDIRS); \
+	do (cd $$i && $(MAKE) $(MFLAGS) uninstall); done
+
 clean cleandir:
 	for i in $(SUBDIRS); \
 	do (cd $$i && $(MAKE) $(MFLAGS) clean); done
diff --git a/appl/ftp/common/Makefile.in b/appl/ftp/common/Makefile.in
index da99cf2dc..d802d7edb 100644
--- a/appl/ftp/common/Makefile.in
+++ b/appl/ftp/common/Makefile.in
@@ -32,6 +32,8 @@ libcommon.a: $(libcommon_OBJS)
 
 install:
 
+uninstall:
+
 TAGS: $(SOURCES)
 	etags $(SOURCES)
 
diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in
index 9cf637f3e..e7618460e 100644
--- a/appl/ftp/ftp/Makefile.in
+++ b/appl/ftp/ftp/Makefile.in
@@ -19,6 +19,7 @@ MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
 INSTALL = @INSTALL@
 
 prefix 	= @prefix@
+exec_prefix = @exec_prefix@
 bindir = @bindir@
 transform=@program_transform_name@
 
diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in
index 2cf6d0f0b..86cfa65d6 100644
--- a/appl/ftp/ftpd/Makefile.in
+++ b/appl/ftp/ftpd/Makefile.in
@@ -24,6 +24,7 @@ INSTALL = @INSTALL@
 prefix 	= @prefix@
 exec_prefix = @exec_prefix@
 libexecdir = @libexecdir@
+transform=@program_transform_name@
 
 ATHENA = ../../..
 
diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in
index e8e04e24b..e77093aa4 100644
--- a/appl/popper/Makefile.in
+++ b/appl/popper/Makefile.in
@@ -19,6 +19,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
 bindir = @bindir@
+libexecdir = @libexecdir@
 transform=@program_transform_name@
 
 PROG_BIN	= 
diff --git a/appl/telnet/Makefile.in b/appl/telnet/Makefile.in
index 5acc4a35b..b36337aab 100644
--- a/appl/telnet/Makefile.in
+++ b/appl/telnet/Makefile.in
@@ -25,6 +25,10 @@ install: all
 	for i in $(SUBDIRS); \
 	do (cd $$i && $(MAKE) $(MFLAGS) install); done
 
+uninstall:
+	for i in $(SUBDIRS); \
+	do (cd $$i && $(MAKE) $(MFLAGS) uninstall); done
+
 clean cleandir:
 	for i in $(SUBDIRS); \
 	do (cd $$i && $(MAKE) $(MFLAGS) clean); done
diff --git a/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in
index a6a2332a5..8e91c52b3 100644
--- a/appl/telnet/libtelnet/Makefile.in
+++ b/appl/telnet/libtelnet/Makefile.in
@@ -32,6 +32,9 @@ libtelnet.a: $(OBJECTS)
 install:
 	@true
 
+uninstall:
+	@true
+
 TAGS: $(SOURCES)
 	etags $(SOURCES)
 
diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in
index 2b2a8ca73..692000d1c 100644
--- a/appl/telnet/telnet/Makefile.in
+++ b/appl/telnet/telnet/Makefile.in
@@ -19,6 +19,7 @@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
 PROGS = telnet
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 bindir = @bindir@
 transform=@program_transform_name@
 
diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in
index eb1a66ef0..91bc0bc78 100644
--- a/appl/xnlock/Makefile.in
+++ b/appl/xnlock/Makefile.in
@@ -49,21 +49,21 @@ Wall:
 
 install: all
 	$(MKINSTALLDIRS) $(bindir)
-	for x in $(PROG_BIN); do 
+	for x in $(PROG_BIN); do \
 	  $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 	$(MKINSTALLDIRS) $(mandir)/man1
 	(cd $(srcdir); \
 	for x in $(MAN1); do \
-	  $(INSTALL_DATA) $$x $(mandir)/man1/`echo $$x | echo $(transform) | sed 's/\.man/.1/'`; \
+	  $(INSTALL_DATA) $$x $(mandir)/man1/`echo $$x | sed '$(transform)' | sed 's/\.man/.1/'`; \
 	done)
 
 uninstall:
-	for x in $(PROG_BIN); do 
+	for x in $(PROG_BIN); do \
 	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
 	done
 	for x in $(MAN1); do \
-	  rm -f $(mandir)/man1/`echo $$x | echo $(transform) | sed 's/\.man/.1/'`; \
+	  rm -f $(mandir)/man1/`echo $$x | sed '$(transform)' | sed 's/\.man/.1/'`; \
 	done
 
 TAGS: $(SOURCES)
diff --git a/lib/auth/Makefile.in b/lib/auth/Makefile.in
index 3d5ee8dcc..e17ae86dd 100644
--- a/lib/auth/Makefile.in
+++ b/lib/auth/Makefile.in
@@ -24,7 +24,15 @@ install: all
 		for i in $$SUBDIRS; \
 		do (cd $$i && $(MAKE) $(MFLAGS) install); done
 
+uninstall:
+		SUBDIRS=$(SUBDIRS); \
+		for i in $$SUBDIRS; \
+		do (cd $$i && $(MAKE) $(MFLAGS) uninstall); done
+
 check:
+		SUBDIRS=$(SUBDIRS); \
+		for i in $$SUBDIRS; \
+		do (cd $$i && $(MAKE) $(MFLAGS) check); done
 
 clean:
 		SUBDIRS=$(SUBDIRS); \
diff --git a/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in
index 9e0aae943..e7625ad1f 100644
--- a/lib/auth/afskauthlib/Makefile.in
+++ b/lib/auth/afskauthlib/Makefile.in
@@ -19,6 +19,7 @@ INSTALL_DATA	= @INSTALL_DATA@
 MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 libdir = @libdir@
 
 PICFLAGS = @REAL_PICFLAGS@
diff --git a/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in
index 8065ba133..62228010d 100644
--- a/lib/auth/pam/Makefile.in
+++ b/lib/auth/pam/Makefile.in
@@ -18,6 +18,7 @@ INSTALL_DATA	= @INSTALL_DATA@
 MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 libdir = @libdir@
 
 PICFLAGS = @REAL_PICFLAGS@
diff --git a/lib/auth/sia/Makefile.in b/lib/auth/sia/Makefile.in
index ce1d27536..1c9b2194f 100644
--- a/lib/auth/sia/Makefile.in
+++ b/lib/auth/sia/Makefile.in
@@ -18,6 +18,7 @@ INSTALL_DATA	= @INSTALL_DATA@
 MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 libdir = @libdir@
 
 PICFLAGS = @REAL_PICFLAGS@
diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in
index 1df56a0c4..572c550ea 100644
--- a/lib/editline/Makefile.in
+++ b/lib/editline/Makefile.in
@@ -18,6 +18,7 @@ INSTALL_DATA	= @INSTALL_DATA@
 MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 libdir = @libdir@
 
 PICFLAGS = @PICFLAGS@
diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index a41d067d3..6c201892d 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/Makefile.in
@@ -18,6 +18,7 @@ INSTALL_DATA	= @INSTALL_DATA@
 MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 libdir = @libdir@
 
 PICFLAGS = @PICFLAGS@
@@ -47,6 +48,7 @@ install: all
 	$(INSTALL) -m 0555 $(LIB) $(libdir)
 
 uninstall:
+	rm -f $(libdir)/$(LIB)
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in
index 5032f93fa..79ed70dda 100644
--- a/lib/otp/Makefile.in
+++ b/lib/otp/Makefile.in
@@ -19,6 +19,7 @@ INSTALL_DATA	= @INSTALL_DATA@
 MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 libdir = @libdir@
 
 PICFLAGS = @PICFLAGS@
@@ -59,6 +60,7 @@ install: all
 	$(INSTALL) -m 0555 $(LIB) $(libdir)
 
 uninstall:
+	rm -f $(libdir)/$(LIB)
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in
index 15894b983..d820ffc37 100644
--- a/lib/roken/Makefile.in
+++ b/lib/roken/Makefile.in
@@ -19,6 +19,7 @@ INSTALL_DATA	= @INSTALL_DATA@
 MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 libdir = @libdir@
 
 PICFLAGS = # @PICFLAGS@
diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in
index d6a574208..278cbbcbd 100644
--- a/lib/sl/Makefile.in
+++ b/lib/sl/Makefile.in
@@ -18,6 +18,7 @@ INSTALL_DATA	= @INSTALL_DATA@
 MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 libdir = @libdir@
 
 PICFLAGS = @PICFLAGS@
@@ -51,6 +52,7 @@ install: all
 	$(INSTALL) -m 0555 $(LIB) $(libdir)
 
 uninstall:
+	rm -f $(libdir)/$(LIB)
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)