5 files changed, 23 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules
index c322e7c54..7db7920c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,6 +155,15 @@ binary-indep: build-indep binary-arch-dynamic
 	dh_installchangelogs    -pzsh-doc -pzsh-common
 	dh_lintian           -i
 	dh_compress          -i                        -Xpdf
+	set -e; cd debian/zsh-common/usr/share/doc/zsh-common; for x in *; do \
+		case "$$x" in \
+			(copyright|changelog.Debian.gz) \
+				;; \
+			(*) \
+				ln -s ../zsh-common/$$x ../zsh/$$x; \
+				;; \
+		esac; \
+	done
 	dh_fixperms          -i
 	dh_installdeb        -i
 	dh_md5sums           -i
@@ -182,7 +191,12 @@ binary-arch-dynamic: build-arch
 		-dDepends    debian/zsh/bin/*   \
 		-dRecommends debian/zsh/usr/lib/*/zsh/*/zsh/*.so
 
-	dh_installdocs -pzsh             -pzsh-dbg --link-doc=zsh-common
+	dh_installdocs -pzsh -pzsh-dbg --link-doc=zsh
+	dh_installchangelogs -pzsh
+	# These are in zsh-common and there is no Policy reason why
+	# they can't be
+	rm -v -f debian/zsh/usr/share/doc/zsh/changelog
+	rm -v -f debian/zsh/usr/share/doc/zsh/NEWS.Debian
 
 binary-arch-static: build-static
 	dh_testdir
@@ -192,7 +206,8 @@ binary-arch-static: build-static
 
 	# Do not symlink /usr/share/doc/zsh-static to
 	# /usr/share/doc/zsh-common because zsh-static has a unique,
-	# generated README.Debian
+	# generated README.Debian, and because --link-doc between
+	# arch-dep and arch-indep packages breaks binNMUs
 	dh_installdocs       -pzsh-static
 	awk 'BEGIN { print "The following modules are statically-compiled into the static zsh binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/zsh-static/usr/share/doc/zsh-static/README.Debian
 
@@ -215,7 +230,8 @@ binary-arch-dev: build-arch
 
 	cd debian/zsh-dev/usr/share/aclocal; mv aczshoot.m4 zshoot.m4
 
-	dh_installdocs -pzsh-dev --link-doc=zsh-common
+	dh_installdocs -pzsh-dev
+	dh_installchangelogs -pzsh-dev
 
 binary-arch: binary-arch-dynamic binary-arch-static binary-arch-dev
 	dh_lintian    -a
diff --git a/debian/zsh-common.dirs b/debian/zsh-common.dirs
index bf201bbea..51addab78 100644
--- a/debian/zsh-common.dirs
+++ b/debian/zsh-common.dirs
@@ -1,3 +1,4 @@
 etc/zsh
+usr/share/doc/zsh
 usr/share/man
 usr/share/zsh/help
diff --git a/debian/zsh-common.maintscript b/debian/zsh-common.maintscript
new file mode 100644
index 000000000..93427a2fe
--- /dev/null
+++ b/debian/zsh-common.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/zsh zsh-common 5.0.7-3
diff --git a/debian/zsh-dev.maintscript b/debian/zsh-dev.maintscript
new file mode 100644
index 000000000..c6e45a87d
--- /dev/null
+++ b/debian/zsh-dev.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/zsh-dev zsh-common 5.0.7-3
diff --git a/debian/zsh.maintscript b/debian/zsh.maintscript
new file mode 100644
index 000000000..93427a2fe
--- /dev/null
+++ b/debian/zsh.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/zsh zsh-common 5.0.7-3