5 files changed, 17 insertions, 6 deletions
diff --git a/debian/control b/debian/control
index c76a426a9..a27158c4d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: shells
 Priority: optional
 Build-Depends: bsdextrautils | bsdmainutils (<< 12~),
                debhelper-compat (= 13),
+               debhelper (>= 13.4),
                dpkg-dev (>= 1.16.2~),
                groff,
                groff-base,
@@ -34,7 +35,8 @@ Package: zsh-common
 Architecture: all
 Depends: ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Replaces: zsh (<= 5.0.2-1)
+Replaces: zsh (<= 5.0.2-1), zsh-doc (>= 5.8-7~)
+Breaks: zsh-doc (>= 5.8-7~)
 Recommends: zsh
 Suggests: zsh-doc
 Multi-Arch: foreign
diff --git a/debian/zsh-common.doc-base b/debian/zsh-common.doc-base
new file mode 100644
index 000000000..2b719364e
--- /dev/null
+++ b/debian/zsh-common.doc-base
@@ -0,0 +1,13 @@
+Document: zsh-faq
+Title: Z Shell FAQ
+Author: Peter Stephenson <coordinator@zsh.org>
+Abstract: This document contains a list of frequently-asked (or
+ otherwise significant) questions concerning the Z-shell, a command
+ interpreter for many UNIX systems which is freely available to anyone
+ with FTP access.  Zsh is among the most powerful freely available
+ Bourne-like shells for interactive use.
+Section: Shells
+
+Format: Text
+Index: /usr/share/doc/zsh-common/FAQ.gz
+Files: /usr/share/doc/zsh-common/FAQ.gz
diff --git a/debian/zsh-common.docs b/debian/zsh-common.docs
index e31e29544..9e8d2806d 100644
--- a/debian/zsh-common.docs
+++ b/debian/zsh-common.docs
@@ -12,3 +12,4 @@ MACHINES
 META-FAQ
 NEWS
 README
+obj/Etc/FAQ
diff --git a/debian/zsh-doc.doc-base.faq b/debian/zsh-doc.doc-base.faq
index f2b9641e5..841205324 100644
--- a/debian/zsh-doc.doc-base.faq
+++ b/debian/zsh-doc.doc-base.faq
@@ -11,7 +11,3 @@ Section: Shells
 Format: HTML
 Index: /usr/share/doc/zsh-common/html/FAQ.html
 Files: /usr/share/doc/zsh-common/html/FAQ*.html
-
-Format: Text
-Index: /usr/share/doc/zsh-common/FAQ.gz
-Files: /usr/share/doc/zsh-common/FAQ.gz
diff --git a/debian/zsh-doc.docs b/debian/zsh-doc.docs
index 1996b078f..60cb2382a 100644
--- a/debian/zsh-doc.docs
+++ b/debian/zsh-doc.docs
@@ -1,2 +1 @@
 obj/Doc/zsh.pdf
-obj/Etc/FAQ