diff --git a/Makefile b/Makefile
index c4192d3..e490128 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/data/project.conf \
 		$(PACKAGE)-$(VERSION)/doc/Makefile \
 		$(PACKAGE)-$(VERSION)/doc/configctl.css.xml \
-		$(PACKAGE)-$(VERSION)/doc/configctl.xml \
+		$(PACKAGE)-$(VERSION)/doc/configctl.xml.in \
 		$(PACKAGE)-$(VERSION)/doc/docbook.sh \
 		$(PACKAGE)-$(VERSION)/doc/gtkdoc.sh \
 		$(PACKAGE)-$(VERSION)/doc/manual.css.xml \
diff --git a/doc/Makefile b/doc/Makefile
index 45cd37c..46a0d5d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -18,10 +18,10 @@ subdirs:
 		$(MAKE) OBJDIR="$(OBJDIR)$$i/"; \
 		else $(MAKE); fi) || exit; done
 
-$(OBJDIR)configctl.1: configctl.xml
+$(OBJDIR)configctl.1: $(OBJDIR)configctl.xml
 	./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)configctl.1"
 
-$(OBJDIR)configctl.html: configctl.css.xml configctl.xml manual.css.xml
+$(OBJDIR)configctl.html: configctl.css.xml $(OBJDIR)configctl.xml manual.css.xml
 	./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)configctl.html"
 
 $(OBJDIR)configctl.xml: ../tools/subst.sh configctl.xml.in