6 files changed, 29 insertions, 0 deletions
diff --git a/debian/rules b/debian/rules
index b7d9b0834..9af63f348 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,7 @@ build-static:
 
 override_dh_auto_build-indep:
 	dh_auto_build -B obj -- pdf
+	dh_auto_build -B obj/Etc # FAQ
 
 override_dh_auto_test-arch:
 	if dpkg-architecture -qDEB_BUILD_ARCH_OS | grep -qv hurd; then \
diff --git a/debian/zsh-common.doc-base b/debian/zsh-common.doc-base
new file mode 100644
index 000000000..573f27767
--- /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 shell 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
new file mode 100644
index 000000000..690740029
--- /dev/null
+++ b/debian/zsh-doc.doc-base.faq
@@ -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 shell for interactive use.
+Section: Shells
+
+Format: HTML
+Index: /usr/share/doc/zsh-common/html/FAQ.html
+Files: /usr/share/doc/zsh-common/html/FAQ*.html
diff --git a/debian/zsh-doc.doc-base b/debian/zsh-doc.doc-base.manual
index c71f31938..c71f31938 100644
--- a/debian/zsh-doc.doc-base
+++ b/debian/zsh-doc.doc-base.manual
diff --git a/debian/zsh-doc.install b/debian/zsh-doc.install
new file mode 100644
index 000000000..faaaf3d68
--- /dev/null
+++ b/debian/zsh-doc.install
@@ -0,0 +1 @@
+obj/Etc/FAQ*.html usr/share/doc/zsh-common/html/