diff --git a/include/Makefile.in b/include/Makefile.in
index 9ad3aed3b..eef9e3e98 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,22 +1,48 @@
-HEADERS = asn1.h asn1_err.h bits.h cache.h config_file.h des.h error.h	\
-	gssapi.h hdb.h hdb_err.h keytab.h krb5.h krb5_err.h md4.h md5.h	\
-	roken.h sha.h sl.h store.h
+HEADERS = \
+	asn1.h asn1_err.h bits.h cache.h config_file.h \
+	des.h error.h gssapi.h hdb.h hdb_err.h \
+	keytab.h krb5.h krb5_err.h md4.h md5.h roken.h \
+	sha.h sl.h store.h
 
-srcdir	= @srcdir@
-VPATH	= $(srcdir)
-top_srcdir = @top_srcdir@
-CC	= @CC@
-CFLAGS	= @CFLAGS@
-DEFS	= -DHOST=\"@CANONICAL_HOST@\" 
+MAYBE_HEADERS = \
+	err.h
 
-LN_S = @LN_S@
+srcdir		= @srcdir@
+VPATH		= $(srcdir)
+top_srcdir 	= @top_srcdir@
+prefix		= @prefix@
+includedir	= @includedir@
+CC		= @CC@
+INSTALL		= @INSTALL@
+INSTALL_DATA	= @INSTALL_DATA@
+CFLAGS		= @CFLAGS@
+DEFS		= -DHOST=\"@CANONICAL_HOST@\" 
+LN_S		= @LN_S@
+HAVE_ERR_H	= @ac_cv_header_err_h@
+mkinstalldirs	= $(SHELL) $(top_srcdir)/mkinstalldirs
 
 all:
-	for i in $(HEADERS); do \
+	for i in $(HEADERS) $(MAYBE_HEADERS); do \
 	if test ! -h $$i -a ! -f $$i ; then X="$$X $$i"; fi \
 	done; \
 	if test -n "$$X" ; then $(MAKE) $$X; fi
 
+install:
+	$(mkinstalldirs) $(includedir)
+	for i in $(HEADERS); \
+	  do $(INSTALL_DATA) $$i $(includedir)/$$i; done
+	-if test "$(HAVE_ERR_H)" != yes; then \
+	  $(INSTALL_DATA) err.h $(includedir)/err.h; \
+	fi
+
+uninstall:
+	for x in $(HEADERS); do \
+	  rm -f $(includedir)/$$x; \
+	done
+	-if test "$(HAVE_ERR_H)" != yes; then \
+	  rm -f $(includedir)/err.h; \
+	fi
+
 .c.o:
 	$(CC) $(CFLAGS) $(DEFS) -c $< 
 
@@ -35,6 +61,11 @@ asn1_err.h:
 hdb_err.h:
 	$(LN_S) ../lib/error/hdb_err.h .
 
+err.h:
+	if test "$(HAVE_ERR_H)" != yes; then \
+	  $(LN_S) $(top_srcdir)/lib/roken/err.h err.h; \
+	fi || true
+
 error.h:
 	$(LN_S) $(top_srcdir)/lib/error/error.h .