diff --git a/TODO b/TODO
index 0187f8f..4fb2e74 100644
--- a/TODO
+++ b/TODO
@@ -15,6 +15,8 @@ Add Device Properties:
 
 Rethink enums and results passed, should be strings and D-Bus errors
 
+Add API docs (see doc/dbus and doc subdir):
+http://gitweb.freedesktop.org/?p=DeviceKit/DeviceKit-disks.git;a=tree
+
 Register fprintd' po file with Transifex, Rosetta or the Translation Project
 
-
diff --git a/data/Makefile.am b/data/Makefile.am
index fe460c0..1227278 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -18,6 +18,9 @@ polkit_DATA = $(polkit_in_files:.policy.in=.policy)
 confdir = $(sysconfdir)/
 conf_DATA = fprintd.conf
 
+EXTRA_DIST = $(dbus_services_in_files) $(dbus_conf_DATA) $(polkit_in_files) $(conf_DATA)
+CLEANFILES = $(polkit_DATA) $(dbus_services_DATA)
+
 check:
 	$(POLKIT_POLICY_FILE_VALIDATE) $(polkit_DATA)
 
diff --git a/pam/Makefile.am b/pam/Makefile.am
index 710cfb9..d262023 100644
--- a/pam/Makefile.am
+++ b/pam/Makefile.am
@@ -1,7 +1,7 @@
 if HAVE_PAM
 
 pammod_PROGRAMS = pam_fprintd.so
-pammoddir=/lib/security
+pammoddir=$(libdir)/security
 
 pam_fprintd_so_SOURCES = pam_fprintd.c
 pam_fprintd_so_CFLAGS = -fPIC $(WARN_CFLAGS) $(GLIB_CFLAGS)
@@ -10,4 +10,4 @@ pam_fprintd_so_LDADD = $(PAM_LIBS) $(GLIB_LIBS)
 
 endif
 
-EXTRA_DIST = pam_fprint.c
+EXTRA_DIST = pam_fprintd.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 64e46ac..01933d7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+data/net.reactivated.fprint.device.policy.in
 src/main.c
 src/manager.c
 src/device.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 94a50ce..a291d6f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,11 +2,17 @@ BUILT_SOURCES = manager-dbus-glue.h device-dbus-glue.h
 noinst_HEADERS = $(BUILT_SOURCES)
 
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = fprintd.xml
+EXTRA_DIST = manager.xml device.xml
 
 libexec_PROGRAMS = fprintd
 
-fprintd_SOURCES = main.c manager.c device.c file_storage.c egg-dbus-monitor.c egg-dbus-monitor.h
+fprintd_SOURCES =				\
+	main.c fprintd.h			\
+	manager.c				\
+	device.c				\
+	file_storage.c file_storage.h storage.h	\
+	egg-dbus-monitor.c egg-dbus-monitor.h
+
 fprintd_LDADD = $(FPRINT_LIBS) $(DAEMON_LIBS)
 fprintd_CFLAGS = $(WARN_CFLAGS) $(FPRINT_CFLAGS) $(DAEMON_CFLAGS) -DLOCALEDIR=\""$(datadir)/locale"\" -DPLUGINDIR=\""$(libdir)/fprintd/modules"\"