diff --git a/man/Makefile.am b/man/Makefile.am
index 376bde71..71d2073b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -9,3 +9,6 @@ SUFFIXES = .1 .man
 .man.1:
 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
+EXTRA_DIST = weston.man
+
+CLEANFILES = $(man_MANS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f0c48e4..acc2415c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,6 @@ weston_LDADD = $(COMPOSITOR_LIBS) $(DLOPEN_LIBS) -lm ../shared/libshared.la
 weston_SOURCES =				\
 	git-version.h				\
 	log.c					\
-	log.h					\
 	compositor.c				\
 	compositor.h				\
 	filter.c				\