diff --git a/share/mk/doc.commands.mk b/share/mk/doc.commands.mk
index a0bb9de688..38c4163d3e 100644
--- a/share/mk/doc.commands.mk
+++ b/share/mk/doc.commands.mk
@@ -46,8 +46,8 @@ BZIPOPTS?=	-qf9
 GZIP?=		gzip
 GZIPOPTS?=	-qf9
 TAR?=		/usr/bin/tar
-ZIP?=		${TAR}
-ZIPOPTS?=	-c --format=zip --options zip:compression=deflate -f
+ZIP?=		${PREFIX}/bin/zip
+ZIPOPTS?=	-9X
 
 #
 # Rendering and format conversion
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 91697efe48..90fa9b935b 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -364,7 +364,8 @@ ${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
 .if defined(LOCAL_IMAGES_LIB) || defined(LOCAL_IMAGES_PNG)
 	${CP} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} OEBPS/
 .endif
-	${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype OEBPS META-INF
+	${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype
+	${ZIP} ${ZIPOPTS} -Dr ${DOC}.epub OEBPS META-INF
 
 # TXT --------------------------------------------------------------------