diff --git a/Makefile.am b/Makefile.am
index 639e54bda068d4c9cb6828339f41df6194f3ff00..9194e3096793be42063de0affc46506dea759cf0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1709,11 +1709,6 @@ dist-hook:
 	$(MAKE) $(AM_MAKEFLAGS) regen-vcs-version
 	rm -f $(top_distdir)/vcs-version
 	cp -p $(srcdir)/vcs-version $(top_distdir)
-if MANPAGES_IN_DOC
-	echo 'Building distribution with man pages included in documentation is' \
-	     'not allowed as they can contain fixed paths' >&2; \
-	exit 1
-endif
 
 # a distcheck hook rule for catching revision control directories
 distcheck-hook:
@@ -1743,6 +1738,10 @@ distcheck-hook:
 	   echo "Found unreleased version in NEWS." >&2; \
 	   exit 1; \
 	fi
+	if test -e $(top_distdir)/doc/man-html; then \
+	  echo "Found documentation including man pages in final archive" >&2; \
+	  exit 1; \
+	fi
 
 # When building a release, stricter checks should be used
 distcheck-release dist-release: export BUILD_RELEASE = 1