diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 000000000..390ba7daf
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,74 @@
+# $Id$
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+noinst_PROGRAMS = bits
+
+INCLUDES=-DHOST=\"@CANONICAL_HOST@\"
+
+include_HEADERS = \
+	asn1.h asn1_err.h bits.h cache.h config_file.h des.h error.h \
+	getarg.h gssapi.h hdb.h hdb_asn1.h hdb_err.h heim_err.h kafs.h \
+	keytab.h krb5.h krb5_err.h md4.h md5.h otp.h parse_time.h \
+	parse_units.h roken.h sha.h sl.h store.h @EXTRA_HEADERS@
+
+EXTRA_HEADERS = err.h
+
+BUILT_SOURCES = $(include_HEADERS)
+CLEANFILES = $(BUILT_SOURCES)
+
+bits.h: bits
+	./bits > bits.h
+
+asn1.h:
+	$(LN_S) ../lib/asn1/asn1.h .
+asn1_err.h:
+	$(LN_S) ../lib/error/asn1_err.h .
+cache.h:
+	$(LN_S) $(top_srcdir)/lib/krb5/cache.h .
+config_file.h:
+	$(LN_S) $(top_srcdir)/lib/krb5/config_file.h .
+des.h:
+	$(LN_S) $(top_srcdir)/lib/des/des.h .
+err.h:
+	$(LN_S) $(top_srcdir)/lib/roken/err.h .
+error.h:
+	$(LN_S) $(top_srcdir)/lib/error/error.h .
+getarg.h:
+	$(LN_S) $(top_srcdir)/lib/roken/getarg.h .
+gssapi.h:
+	$(LN_S) $(top_srcdir)/lib/gssapi/gssapi.h .
+hdb.h:
+	$(LN_S) $(top_srcdir)/lib/hdb/hdb.h .
+hdb_asn1.h:
+	$(LN_S) ../lib/hdb/hdb_asn1.h .
+hdb_err.h:
+	$(LN_S) ../lib/error/hdb_err.h .
+heim_err.h:
+	$(LN_S) ../lib/error/heim_err.h .
+kafs.h:
+	$(LN_S) $(top_srcdir)/lib/kafs/kafs.h .
+keytab.h:
+	$(LN_S) $(top_srcdir)/lib/krb5/keytab.h .
+krb5.h:
+	$(LN_S) $(top_srcdir)/lib/krb5/krb5.h .
+krb5_err.h:
+	$(LN_S) ../lib/error/krb5_err.h .
+md4.h:
+	$(LN_S) $(top_srcdir)/lib/des/md4.h .
+md5.h:
+	$(LN_S) $(top_srcdir)/lib/des/md5.h .
+otp.h:
+	$(LN_S) $(top_srcdir)/lib/otp/otp.h .
+parse_time.h:
+	$(LN_S) $(top_srcdir)/lib/roken/parse_time.h .
+parse_units.h:
+	$(LN_S) $(top_srcdir)/lib/roken/parse_units.h .
+roken.h:
+	$(LN_S) $(top_srcdir)/lib/roken/roken.h .
+sha.h:
+	$(LN_S) $(top_srcdir)/lib/des/sha.h .
+sl.h:
+	$(LN_S) $(top_srcdir)/lib/sl/sl.h .
+store.h:
+	$(LN_S) $(top_srcdir)/lib/krb5/store.h .