diff --git a/doc/Makefile.am b/doc/Makefile.am
index c37e1b39..e33ad1dd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -80,15 +80,14 @@ man.out/*.3 man.out/*.5:	man.out/*.1
 endif
 else
 
-
-html.out/*:
+html.out/*:	$(abs_builddir)/html.out
+$(abs_builddir)/html.out:
 	$(LN_S) "$(srcdir)/html.out" html.out
 
-man.out/*.1:
+man.out/*.3 man.out/*.5 man.out/*.1:	$(abs_builddir)/man.out
+$(abs_builddir)/man.out:
 	$(LN_S) "$(srcdir)/man.out" man.out
 
-man.out/*.3 man.out/*.5:	man.out/*.1
-
 endif
 
 maintainer-clean-local:
diff --git a/doc/nonpersistent/Makefile.am b/doc/nonpersistent/Makefile.am
index b8ec4af2..e67c6aff 100644
--- a/doc/nonpersistent/Makefile.am
+++ b/doc/nonpersistent/Makefile.am
@@ -10,7 +10,9 @@ dist_noinst_DATA = ChangeLog
 
 if SVN_CHECKOUT
 
-wiki.out/*:
+wiki.out/*:	wiki.out
+wiki.out:
+	-rm -fr wiki.out
 	test -n "$(WGET)" -a -n "$(SED)" -a -n "$(TR)" -a -n "$(XSLTPROC)"
 	WGET="$(WGET)" WGET_OPTS="$(WGET_OPTS)" SED="$(SED)" TR="$(TR)" XSLTPROC="$(XSLTPROC)" \
 		PROJECT="@PACKAGE_NAME@" \
@@ -33,7 +35,8 @@ ChangeLog:
 
 else
 
-wiki.out/*:
+wiki.out/*:	$(abs_builddir)/wiki.out
+$(abs_builddir)/wiki.out:
 	$(LN_S) "$(srcdir)/wiki.out" wiki.out
 
 ChangeLog: