diff --git a/Makefile.am b/Makefile.am
index 67fc7c7..f119cef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,4 +6,12 @@ if WITH_DOC
 SUBDIRS += doc
 endif
 
-EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES
+EXTRA_DIST = \
+	CREDITS \
+	HISTORY \
+	INSTALL \
+	LICENSE \
+	MANIFEST \
+	README \
+	RELNOTES \
+	misc/gendoc.pl
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 63dd0bd..a04219d 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -55,12 +55,17 @@ OMAN = \
 	pam_vprompt.3 \
 	$(NULL)
 
+EXTRA_DIST = openpam.man pam.man
+
 ALLCMAN = $(PMAN) $(MMAN) $(OMAN)
-LINKS= $(ALLCMAN:.3=.c)
 
-man3_MANS = $(ALLCMAN) openpam.3 pam.3 pam_conv.3
+LINKS = $(ALLCMAN:.3=.c) openpam_configure.c openpam_dispatch.c
 
-man5_MANS = pam.conf.5
+man3_MANS = $(ALLCMAN) openpam.3 pam.3
+
+dist_man3_MANS = pam_conv.3
+
+dist_man5_MANS = pam.conf.5
 
 CLEANFILES = $(ALLCMAN) $(LINKS) openpam.3 pam.3 symlink-stamp
 
@@ -72,12 +77,12 @@ $(LINKS): symlink-stamp
 
 symlink-stamp: Makefile
 	for lnk in $(LINKS); do \
-	    ln -sf $(top_srcdir)/lib/$$lnk ./; \
-	done && \
+	    ln -sf $(top_srcdir)/lib/$$lnk . || exit; \
+	done
 	touch symlink-stamp
 
 .c.3: symlink-stamp
-	perl -w $(GENDOC) $(top_srcdir)/lib/$*.c
+	perl -w $(GENDOC) $<
 
 openpam.3: $(OMAN) $(GENDOC) openpam.man
 	perl -w $(GENDOC) -o $(OMAN) <$(srcdir)/openpam.man
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f6862c6..dac50fd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,6 +6,8 @@ INCLUDES = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libpam.la
 
+noinst_HEADERS = openpam_impl.h
+
 libpam_la_SOURCES = \
 	openpam_borrow_cred.c \
 	openpam_configure.c \
@@ -54,6 +56,19 @@ libpam_la_CFLAGS = -DOPENPAM_MODULES_DIR='"@OPENPAM_MODULES_DIR@/"'
 
 libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@ @DL_LIBS@
 
+EXTRA_DIST = \
+	pam_sm_acct_mgmt.c \
+	pam_sm_authenticate.c \
+	pam_sm_authenticate_secondary.c \
+	pam_sm_chauthtok.c \
+	pam_sm_close_session.c \
+	pam_sm_get_mapped_authtok.c \
+	pam_sm_get_mapped_username.c \
+	pam_sm_open_session.c \
+	pam_sm_set_mapped_authtok.c \
+	pam_sm_set_mapped_username.c \
+	pam_sm_setcred.c
+
 # Not implemented yet:
 #	pam_authenticate_secondary.c
 #	pam_get_mapped_authtok.c