diff --git a/src/pam_panic/Makefile.am b/src/pam_panic/Makefile.am
index 994f30e..925f929 100644
--- a/src/pam_panic/Makefile.am
+++ b/src/pam_panic/Makefile.am
@@ -6,9 +6,13 @@ securelibexecdir = $(securelibdir)
 securelibexec_LTLIBRARIES = pam_panic.la
 pam_panic_la_SOURCES = \
 	pam_panic.c \
+	pam_panic.h \
 	pam_panic_authdevice.c \
+	pam_panic_authdevice.h \
 	pam_panic_password.c \
-	pam_panic_reject.c
+	pam_panic_password.h \
+	pam_panic_reject.c \
+	pam_panic_reject.h
 pam_panic_la_LDFLAGS = -module -no-undefined -avoid-version
 pam_panic_la_LIBADD = -lpam -lcrypt
 
diff --git a/src/pam_panic/man/Makefile.am b/src/pam_panic/man/Makefile.am
index 482ab59..179785a 100644
--- a/src/pam_panic/man/Makefile.am
+++ b/src/pam_panic/man/Makefile.am
@@ -1,4 +1,8 @@
-man8_MANS = man8/pam_panic.8
+dist_man8_MANS = man8/pam_panic.8
+dist_data_DATA = \
+	de/man8/pam_panic.8 \
+	es/man8/pam_panic.8 \
+	fr/man8/pam_panic.8
 
 install-data-local: install-man-de install-man-es install-man-fr
 
diff --git a/src/pam_panic_pw/Makefile.am b/src/pam_panic_pw/Makefile.am
index f7dab78..6d795b6 100644
--- a/src/pam_panic_pw/Makefile.am
+++ b/src/pam_panic_pw/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = man
 
 bin_PROGRAMS = pam_panic_pw
-pam_panic_pw_SOURCES = pam_panic_pw.c
+pam_panic_pw_SOURCES = pam_panic_pw.c pam_panic_pw.h
 pam_panic_pw_LDFLAGS = -lcrypt
diff --git a/src/pam_panic_pw/man/Makefile.am b/src/pam_panic_pw/man/Makefile.am
index ac930f4..1cee9a5 100644
--- a/src/pam_panic_pw/man/Makefile.am
+++ b/src/pam_panic_pw/man/Makefile.am
@@ -1,5 +1,5 @@
-man1_MANS = man1/pam_panic_pw.1
-mande1_MANS = de/man1/pam_panic_pw.1
+dist_man1_MANS = man1/pam_panic_pw.1
+dist_data_DATA = man1/pam_panic_pw.1
 
 install-data-local: install-man-de