4 files changed, 18 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index 5d10cd27e..45b973cc6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: bsdmainutils,
                libcap-dev [linux-any],
                libncursesw5-dev,
                libpcre3-dev,
-               texi2html (>= 1.76-3),
                texinfo,
                texlive-latex-recommended | texinfo (<< 5~),
                texlive-latex-base,
diff --git a/debian/patches/replace-texi2html-with-makeinfo b/debian/patches/replace-texi2html-with-makeinfo
new file mode 100644
index 000000000..911258c48
--- /dev/null
+++ b/debian/patches/replace-texi2html-with-makeinfo
@@ -0,0 +1,16 @@
+Description: Replace deprecated texi2html with makeinfo
+Author: Axel Beckert <abe@debian.org>
+
+Index: zsh/Doc/Makefile.in
+===================================================================
+--- zsh.orig/Doc/Makefile.in	2013-01-14 01:49:37.000000000 +0100
++++ zsh/Doc/Makefile.in	2013-08-26 08:25:54.468926080 +0200
+@@ -40,7 +40,7 @@
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ DVIPS = dvips
+-TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files
++TEXI2HTML = makeinfo --html --output . --ifinfo --split=chapter --node-files
+ 
+ .SUFFIXES: .yo .1
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e530b1d79..62ed3e52b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ updates_needed_with_latest_texinfo.patch
 suppress_texinfo_warning_by_adding_item_arguments.patch
 texinfo_remove_leading_whitespace.patch
 vcs_info_guilt_support.patch
+replace-texi2html-with-makeinfo
diff --git a/debian/zsh-doc.doc-base b/debian/zsh-doc.doc-base
index 232ec9182..c71f31938 100644
--- a/debian/zsh-doc.doc-base
+++ b/debian/zsh-doc.doc-base
@@ -12,7 +12,7 @@ Index: /usr/share/info/zsh.info.gz
 Files: /usr/share/info/zsh.info*
 
 Format: HTML
-Index: /usr/share/doc/zsh-doc/html/zsh_toc.html
+Index: /usr/share/doc/zsh-doc/html/index.html
 Files: /usr/share/doc/zsh-doc/html/*.html
 
 Format: PDF