28 files changed, 264 insertions, 622 deletions

diff --git a/news/t-gnus-emacs20/Makefile b/news/t-gnus-emacs20/Makefile
index 6dc88f785cc2..2e095918e345 100644
--- a/news/t-gnus-emacs20/Makefile
+++ b/news/t-gnus-emacs20/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MI
 RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 
 HAS_CONFIGURE=	yes
-TGNUSVERSION=	6_14_5-06
+USE_GMAKE=	yes
+TGNUSVERSION=	6_14_6-04
 MIMEUI_PRODUCT?=semi
 MIMEUI_VERSION?=1.13.7
 MIMEUI_PORT_NAME?=${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
@@ -34,7 +35,7 @@ WITHOUT_MULE=yes
 .endif
 
 .if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
-CONFIGURE_ARGS=	--with-xemacs=${EMACS_CMD}
+CONFIGURE_ARGS=	--with-xemacs=${EMACS_CMD} --with-packagedir=${LOCALBASE}/${EMACS_PACKAGESDIR}
 .else
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/t-gnus \
@@ -42,21 +43,20 @@ CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 .endif
 
 .if defined(EMACS_PACKAGESDIR)
-ALL_TARGET=	package
 INFODIR=	${LOCALBASE}/${EMACS_PACKAGESDIR}/info
 STARTUPDIR=	${EMACS_PACKAGESDIR}/lisp
+INFOFILES=	emacs-mime gnus gnus-ja message message-ja
 .if (${EMACS_PORT_NAME} == "xemacs21")
+ALL_TARGET=	package
 INSTALL_TARGET=	install-package
-ALL_TARGET+=	info
 .elif (${EMACS_PORT_NAME} == "xemacs21-mule")
-ALL_TARGET+=	info info-ja
+ALL_TARGET=	package-ja
 INSTALL_TARGET=	install-package-ja
 .endif
 .elif (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule")
-ALL_TARGET=	all info info-ja
-INSTALL_TARGET=	install
+ALL_TARGET=	all-ja
+INSTALL_TARGET=	install-ja
 INFODIR=	${LOCALBASE}/info
-INFOFILES=	emacs-mime.info gnus.info gnus-ja.info message.info message-ja.info
 STARTUPDIR=	${EMACS_SITE_LISPDIR}
 .endif
 
@@ -94,16 +94,14 @@ post-install:
 .endfor
 .endif
 	${INSTALL_DATA} ${WRKDIR}/t-gnus-startup.el ${PREFIX}/${STARTUPDIR}
-.if (${EMACS_PORT_NAME} == "emacs20")
+# For XEmacs, ${INFODIR}/dir is not necessary.
+.if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
 .for file in ${INFOFILES}
-	install-info ${INFODIR}/${file} ${INFODIR}/dir
+	 install-info --delete ${INFODIR}/${file} ${INFODIR}/dir
 .endfor
-.elif (${EMACS_PORT_NAME} == "mule")
-	install-info --section=${DIRSECTION} ${INFODIR}/emacs-mime.info --entry="* Emacs MIME: (emacs-mime.info). The MIME de/composition library." ${INFODIR}/dir
-	install-info --section=${DIRSECTION} ${INFODIR}/gnus.info --entry="* Gnus: (gnus.info).   The news reader gnus" ${INFODIR}/dir
-	install-info --section=${DIRSECTION} ${INFODIR}/gnus-ja.info --entry="* Gnus-ja: (gnus-ja.info).   The news reader gnus" ${INFODIR}/dir
-	install-info --section=${DIRSECTION} ${INFODIR}/message.info --entry="* Message: (message.info).   Mail and news composition mode that goes with Gnus." ${INFODIR}/dir
-	install-info --section=${DIRSECTION} ${INFODIR}/message-ja.info --entry="* Message-ja: (message-ja.info).   Mail and news composition mode that goes with Gnus." ${INFODIR}/dir
+	if [ `${GREP} '^*' ${INFODIR}/dir | wc -l` -eq 1 ]; then \
+		${RM} ${INFODIR}/dir; \
+	fi
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/news/t-gnus-emacs20/distinfo b/news/t-gnus-emacs20/distinfo
index a995220d99ed..5a32ba9cf2d7 100644
--- a/news/t-gnus-emacs20/distinfo
+++ b/news/t-gnus-emacs20/distinfo
@@ -1 +1 @@
-MD5 (t-gnus-6_14_5-06.tar.gz) = 77764050381d208aaf1843f6c98f2678
+MD5 (t-gnus-6_14_6-04.tar.gz) = a0a8d55a688842e4f304505604e43248
diff --git a/news/t-gnus-emacs20/files/patch-aa b/news/t-gnus-emacs20/files/patch-aa
deleted file mode 100644
index 295f28112c58..000000000000
--- a/news/t-gnus-emacs20/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- texi/gnus-ja.texi.orig	Fri Aug 25 21:07:28 2000
-+++ texi/gnus-ja.texi	Wed Sep 13 15:18:32 2000
-@@ -1,13 +1,15 @@
- @c \input texinfo @c -*- mode: texinfo; coding: iso-2022-7bit-ss2; -*-
- 
--@setfilename gnus-ja
-+@setfilename gnus-ja.info
- @settitle T-gnus 6.14 Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
--@c @direntry
--@c * Gnus-ja: (gnus-ja).   The news reader gnus (日本語版).
--@c @end direntry
-+@ifinfo
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Gnus-ja: (gnus-ja.info).  The news reader gnus (日本語版).
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/news/t-gnus-emacs20/files/patch-ab b/news/t-gnus-emacs20/files/patch-ab
deleted file mode 100644
index 2bd1d1f17d6e..000000000000
--- a/news/t-gnus-emacs20/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- texi/message-ja.texi.orig	Mon May  8 09:21:25 2000
-+++ texi/message-ja.texi	Wed Sep 13 15:16:41 2000
-@@ -1,13 +1,15 @@
- \input texinfo                  @c -*-texinfo-*-
- 
--@setfilename message-ja
-+@setfilename message-ja.info
- @settitle T-gnus 6.14 Message Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
--@c @direntry
--@c * Message: (message).   Mail and news composition mode that goes with Gnus.
--@c @end direntry
-+@ifinfo
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message-ja: (message-ja.info).   Mail and news composition mode that goes with Gnus.
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/news/t-gnus-emacs20/files/patch-ac b/news/t-gnus-emacs20/files/patch-ac
deleted file mode 100644
index f3f32caa907d..000000000000
--- a/news/t-gnus-emacs20/files/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- texi/gnus.texi.~1~	Fri Aug 25 21:07:28 2000
-+++ texi/gnus.texi	Wed Sep 13 15:50:52 2000
-@@ -1,13 +1,14 @@
- \input texinfo                  @c -*-texinfo-*-  -*- coding: iso-latin-1 -*-
- 
--@setfilename gnus
-+@setfilename gnus.info
- @settitle T-gnus 6.14 Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
--@c @direntry
--@c * Gnus: (gnus).         The newsreader Gnus.
--@c @end direntry
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Gnus: (gnus.info).       The newsreader Gnus.
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/news/t-gnus-emacs20/files/patch-ad b/news/t-gnus-emacs20/files/patch-ad
deleted file mode 100644
index 28eda18ca3c0..000000000000
--- a/news/t-gnus-emacs20/files/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
---- texi/emacs-mime.texi.~1~	Mon May  8 09:21:10 2000
-+++ texi/emacs-mime.texi	Wed Sep 13 15:49:59 2000
-@@ -1,13 +1,14 @@
- \input texinfo                  @c -*-texinfo-*-
- 
--@setfilename emacs-mime
-+@setfilename emacs-mime.info
- @settitle Emacs MIME Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
--@c @direntry
--@c * Emacs MIME: (emacs-mime).   The MIME de/composition library.
--@c @end direntry
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Emacs MIME: (emacs-mime.info). The MIME de/composition library.
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/news/t-gnus-emacs20/files/patch-ae b/news/t-gnus-emacs20/files/patch-ae
deleted file mode 100644
index d6e2b15e7b1c..000000000000
--- a/news/t-gnus-emacs20/files/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
---- texi/message.texi.~1~	Mon Jul  3 11:08:29 2000
-+++ texi/message.texi	Wed Sep 13 15:54:38 2000
-@@ -1,13 +1,14 @@
- \input texinfo                  @c -*-texinfo-*-
- 
--@setfilename message
-+@setfilename message.info
- @settitle T-gnus 6.14 Message Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
--@c @direntry
--@c * Message: (message).   Mail and news composition mode that goes with Gnus.
--@c @end direntry
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message: (message.info). Mail and news composition mode that goes with Gnus.
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/news/t-gnus-emacs20/files/patch-af b/news/t-gnus-emacs20/files/patch-af
deleted file mode 100644
index 0f25f450acaf..000000000000
--- a/news/t-gnus-emacs20/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- texi/Makefile.in.orig	Mon May  8 09:21:10 2000
-+++ texi/Makefile.in	Wed Sep 13 16:01:57 2000
-@@ -155,7 +155,7 @@
- install:
- 	$(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
- 	@for file in gnus message emacs-mime gnus-ja message-ja; do \
--	  for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-+	  for ifile in `echo $$file.info $$file.info-[0-9] $$file.info-[0-9][0-9]`; do \
- 	    if test -f $$ifile; then \
- 	      echo " $(INSTALL_DATA) $$ifile $(infodir)/$$ifile"; \
- 	      $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
diff --git a/news/t-gnus-emacs20/pkg-plist.emacs20 b/news/t-gnus-emacs20/pkg-plist.emacs20
index 6592f6c31c14..f4e5cb7bcdbf 100644
--- a/news/t-gnus-emacs20/pkg-plist.emacs20
+++ b/news/t-gnus-emacs20/pkg-plist.emacs20
@@ -1,10 +1,6 @@
-%%EMACS_SITE_LISPDIR%%/t-gnus/base64.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/base64.elc
+%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/binhex.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/binhex.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/dgnushack.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/drums.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/drums.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/earcon.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/earcon.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.el
@@ -19,7 +15,6 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bbdb.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.el
@@ -58,6 +53,8 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
+%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.el
@@ -70,7 +67,6 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-picon.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.el
@@ -103,26 +99,22 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-xmas.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/imap.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/imap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/lpath.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mailheader.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mailheader.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/md5.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/md5.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/message.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/message.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/messagexmas.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.el
@@ -163,12 +155,10 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheaderxm.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnlistserv.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.el
@@ -181,18 +171,14 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnslashdot.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nntp.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nntp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnultimate.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnwarchive.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnweb.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/pop3.el
@@ -213,15 +199,14 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/smiley.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/time-date.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/time-date.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/utf7.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/utf7.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/webmail.el
-%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
@@ -239,49 +224,50 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
-@unexec install-info --delete %D/%%INFODIR%%/emacs-mime.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus-ja.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message-ja.info %D/%%INFODIR%%/dir
-%%INFODIR%%/emacs-mime.info
-%%INFODIR%%/gnus.info
-%%INFODIR%%/gnus.info-1
-%%INFODIR%%/gnus.info-10
-%%INFODIR%%/gnus.info-11
-%%INFODIR%%/gnus.info-12
-%%INFODIR%%/gnus.info-13
-%%INFODIR%%/gnus.info-14
-%%INFODIR%%/gnus.info-15
-%%INFODIR%%/gnus.info-16
-%%INFODIR%%/gnus.info-17
-%%INFODIR%%/gnus.info-18
-%%INFODIR%%/gnus.info-2
-%%INFODIR%%/gnus.info-3
-%%INFODIR%%/gnus.info-4
-%%INFODIR%%/gnus.info-5
-%%INFODIR%%/gnus.info-6
-%%INFODIR%%/gnus.info-7
-%%INFODIR%%/gnus.info-8
-%%INFODIR%%/gnus.info-9
-%%INFODIR%%/gnus-ja.info
-%%INFODIR%%/gnus-ja.info-1
-%%INFODIR%%/gnus-ja.info-10
-%%INFODIR%%/gnus-ja.info-11
-%%INFODIR%%/gnus-ja.info-2
-%%INFODIR%%/gnus-ja.info-3
-%%INFODIR%%/gnus-ja.info-4
-%%INFODIR%%/gnus-ja.info-5
-%%INFODIR%%/gnus-ja.info-6
-%%INFODIR%%/gnus-ja.info-7
-%%INFODIR%%/gnus-ja.info-8
-%%INFODIR%%/gnus-ja.info-9
-%%INFODIR%%/message.info
-%%INFODIR%%/message-ja.info
-@exec install-info %D/%%INFODIR%%/emacs-mime.info %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/gnus.info %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/gnus-ja.info %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/message.info %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/message-ja.info %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
+%%INFODIR%%/emacs-mime
+%%INFODIR%%/gnus
+%%INFODIR%%/gnus-1
+%%INFODIR%%/gnus-10
+%%INFODIR%%/gnus-11
+%%INFODIR%%/gnus-12
+%%INFODIR%%/gnus-13
+%%INFODIR%%/gnus-14
+%%INFODIR%%/gnus-15
+%%INFODIR%%/gnus-16
+%%INFODIR%%/gnus-17
+%%INFODIR%%/gnus-18
+%%INFODIR%%/gnus-2
+%%INFODIR%%/gnus-3
+%%INFODIR%%/gnus-4
+%%INFODIR%%/gnus-5
+%%INFODIR%%/gnus-6
+%%INFODIR%%/gnus-7
+%%INFODIR%%/gnus-8
+%%INFODIR%%/gnus-9
+%%INFODIR%%/gnus-ja
+%%INFODIR%%/gnus-ja-1
+%%INFODIR%%/gnus-ja-10
+%%INFODIR%%/gnus-ja-11
+%%INFODIR%%/gnus-ja-12
+%%INFODIR%%/gnus-ja-2
+%%INFODIR%%/gnus-ja-3
+%%INFODIR%%/gnus-ja-4
+%%INFODIR%%/gnus-ja-5
+%%INFODIR%%/gnus-ja-6
+%%INFODIR%%/gnus-ja-7
+%%INFODIR%%/gnus-ja-8
+%%INFODIR%%/gnus-ja-9
+%%INFODIR%%/message
+%%INFODIR%%/message-ja
+@exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
 @dirrm %%EMACS_SITE_LISPDIR%%/t-gnus
 @dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%
diff --git a/news/t-gnus-emacs20/pkg-plist.mule b/news/t-gnus-emacs20/pkg-plist.mule
index 992062a32793..8ebab2d828a6 100644
--- a/news/t-gnus-emacs20/pkg-plist.mule
+++ b/news/t-gnus-emacs20/pkg-plist.mule
@@ -1,10 +1,8 @@
+%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/base64.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/base64.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/binhex.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/binhex.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/dgnushack.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/drums.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/drums.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/earcon.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/earcon.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.el
@@ -19,7 +17,6 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bbdb.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.el
@@ -58,6 +55,8 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
+%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.el
@@ -70,7 +69,6 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-picon.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.el
@@ -103,26 +101,22 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-xmas.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/imap.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/imap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/lpath.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mailheader.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mailheader.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/md5.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/md5.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/message.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/message.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/messagexmas.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.el
@@ -163,12 +157,10 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheaderxm.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnlistserv.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.el
@@ -181,18 +173,14 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnslashdot.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nntp.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nntp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnultimate.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnwarchive.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnweb.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/pop3.el
@@ -213,15 +201,14 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/smiley.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/time-date.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/time-date.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/utf7.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/utf7.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/webmail.el
-%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
@@ -239,56 +226,57 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
-@unexec install-info --delete %D/%%INFODIR%%/emacs-mime.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus-ja.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message-ja.info %D/%%INFODIR%%/dir
-%%INFODIR%%/emacs-mime.info
-%%INFODIR%%/gnus.info
-%%INFODIR%%/gnus.info-1
-%%INFODIR%%/gnus.info-10
-%%INFODIR%%/gnus.info-11
-%%INFODIR%%/gnus.info-12
-%%INFODIR%%/gnus.info-13
-%%INFODIR%%/gnus.info-14
-%%INFODIR%%/gnus.info-15
-%%INFODIR%%/gnus.info-16
-%%INFODIR%%/gnus.info-17
-%%INFODIR%%/gnus.info-18
-%%INFODIR%%/gnus.info-2
-%%INFODIR%%/gnus.info-3
-%%INFODIR%%/gnus.info-4
-%%INFODIR%%/gnus.info-5
-%%INFODIR%%/gnus.info-6
-%%INFODIR%%/gnus.info-7
-%%INFODIR%%/gnus.info-8
-%%INFODIR%%/gnus.info-9
-%%INFODIR%%/gnus-ja.info
-%%INFODIR%%/gnus-ja.info-1
-%%INFODIR%%/gnus-ja.info-10
-%%INFODIR%%/gnus-ja.info-11
-%%INFODIR%%/gnus-ja.info-12
-%%INFODIR%%/gnus-ja.info-13
-%%INFODIR%%/gnus-ja.info-14
-%%INFODIR%%/gnus-ja.info-15
-%%INFODIR%%/gnus-ja.info-16
-%%INFODIR%%/gnus-ja.info-17
-%%INFODIR%%/gnus-ja.info-18
-%%INFODIR%%/gnus-ja.info-2
-%%INFODIR%%/gnus-ja.info-3
-%%INFODIR%%/gnus-ja.info-4
-%%INFODIR%%/gnus-ja.info-5
-%%INFODIR%%/gnus-ja.info-6
-%%INFODIR%%/gnus-ja.info-7
-%%INFODIR%%/gnus-ja.info-8
-%%INFODIR%%/gnus-ja.info-9
-%%INFODIR%%/message.info
-%%INFODIR%%/message-ja.info
-@exec install-info --section="%%DIRSECTION%%" %D/%%INFODIR%%/emacs-mime.info --entry="* Emacs MIME: (emacs-mime.info). The MIME de/composition library." %D/%%INFODIR%%/dir
-@exec install-info --section="%%DIRSECTION%%" %D/%%INFODIR%%/gnus.info --entry="* Gnus: (gnus.info).   The news reader gnus" %D/%%INFODIR%%/dir
-@exec install-info --section="%%DIRSECTION%%" %D/%%INFODIR%%/gnus-ja.info --entry="* Gnus-ja: (gnus-ja.info).   The news reader gnus" %D/%%INFODIR%%/dir
-@exec install-info --section="%%DIRSECTION%%" %D/%%INFODIR%%/message.info --entry="* Message: (message.info).   Mail and news composition mode that goes with Gnus." %D/%%INFODIR%%/dir
-@exec install-info --section="%%DIRSECTION%%" %D/%%INFODIR%%/message-ja.info --entry="* Message-ja: (message-ja.info).   Mail and news composition mode that goes with Gnus." %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
+%%INFODIR%%/emacs-mime
+%%INFODIR%%/gnus
+%%INFODIR%%/gnus-1
+%%INFODIR%%/gnus-10
+%%INFODIR%%/gnus-11
+%%INFODIR%%/gnus-12
+%%INFODIR%%/gnus-13
+%%INFODIR%%/gnus-14
+%%INFODIR%%/gnus-15
+%%INFODIR%%/gnus-16
+%%INFODIR%%/gnus-17
+%%INFODIR%%/gnus-18
+%%INFODIR%%/gnus-2
+%%INFODIR%%/gnus-3
+%%INFODIR%%/gnus-4
+%%INFODIR%%/gnus-5
+%%INFODIR%%/gnus-6
+%%INFODIR%%/gnus-7
+%%INFODIR%%/gnus-8
+%%INFODIR%%/gnus-9
+%%INFODIR%%/gnus-ja
+%%INFODIR%%/gnus-ja-1
+%%INFODIR%%/gnus-ja-10
+%%INFODIR%%/gnus-ja-11
+%%INFODIR%%/gnus-ja-12
+%%INFODIR%%/gnus-ja-13
+%%INFODIR%%/gnus-ja-14
+%%INFODIR%%/gnus-ja-15
+%%INFODIR%%/gnus-ja-16
+%%INFODIR%%/gnus-ja-17
+%%INFODIR%%/gnus-ja-18
+%%INFODIR%%/gnus-ja-19
+%%INFODIR%%/gnus-ja-2
+%%INFODIR%%/gnus-ja-3
+%%INFODIR%%/gnus-ja-4
+%%INFODIR%%/gnus-ja-5
+%%INFODIR%%/gnus-ja-6
+%%INFODIR%%/gnus-ja-7
+%%INFODIR%%/gnus-ja-8
+%%INFODIR%%/gnus-ja-9
+%%INFODIR%%/message
+%%INFODIR%%/message-ja
+@exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
 @dirrm %%EMACS_SITE_LISPDIR%%/t-gnus
 @dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%
diff --git a/news/t-gnus-emacs20/pkg-plist.xemacs21-mule b/news/t-gnus-emacs20/pkg-plist.xemacs21-mule
index 5d89e74cb0d8..d0c73fb88a89 100644
--- a/news/t-gnus-emacs20/pkg-plist.xemacs21-mule
+++ b/news/t-gnus-emacs20/pkg-plist.xemacs21-mule
@@ -1,3 +1,4 @@
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus-startup.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/base64.el
@@ -6,9 +7,6 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/binhex.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/custom-load.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/dgnushack.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/drums.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/drums.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/earcon.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/earcon.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/flow-fill.el
@@ -63,6 +61,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mailcap.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mh.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mh.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ml.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ml.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mlspl.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mlspl.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-move.el
@@ -117,16 +117,12 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/ietf-drums.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/imap.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/imap.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/lpath.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-parse.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-parse.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-prsvr.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-prsvr.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-source.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-source.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mailheader.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mailheader.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/md5.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/message.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/message.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/messagexmas.el
@@ -207,6 +203,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnwarchive.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnweb.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnweb.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnwfm.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnwfm.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/parse-time.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/parse-time.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/pop3.el
@@ -229,6 +227,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/score-mode.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/smiley.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/smiley.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/starttls.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/starttls.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/time-date.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/time-date.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/utf7.el
@@ -237,7 +237,6 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/uudecode.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/webmail.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/webmail.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus-startup.el
 %%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.t-gnus
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
@@ -280,6 +279,7 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 %%INFODIR%%/gnus-ja.info-1
 %%INFODIR%%/gnus-ja.info-10
 %%INFODIR%%/gnus-ja.info-11
+%%INFODIR%%/gnus-ja.info-12
 %%INFODIR%%/gnus-ja.info-2
 %%INFODIR%%/gnus-ja.info-3
 %%INFODIR%%/gnus-ja.info-4
diff --git a/news/t-gnus-mule/files/patch-aa b/news/t-gnus-mule/files/patch-aa
deleted file mode 100644
index 57fec6961621..000000000000
--- a/news/t-gnus-mule/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- texi/gnus-ja.texi.orig	Fri Aug 25 21:07:28 2000
-+++ texi/gnus-ja.texi	Wed Sep 13 15:18:32 2000
-@@ -1,7 +1,7 @@
- @c \input texinfo @c -*- mode: texinfo; coding: iso-2022-7bit-ss2; -*-
- 
--@setfilename gnus-ja
-+@setfilename gnus-ja.info
- @settitle T-gnus 6.14 Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
diff --git a/news/t-gnus-mule/files/patch-ab b/news/t-gnus-mule/files/patch-ab
deleted file mode 100644
index 4902fd2ad7d0..000000000000
--- a/news/t-gnus-mule/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- texi/message-ja.texi.orig	Mon May  8 09:21:25 2000
-+++ texi/message-ja.texi	Wed Sep 13 15:16:41 2000
-@@ -1,7 +1,7 @@
- \input texinfo                  @c -*-texinfo-*-
- 
--@setfilename message-ja
-+@setfilename message-ja.info
- @settitle T-gnus 6.14 Message Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
diff --git a/news/t-gnus-mule/files/patch-ac b/news/t-gnus-mule/files/patch-ac
deleted file mode 100644
index 9a2645c76e03..000000000000
--- a/news/t-gnus-mule/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- texi/gnus.texi.~1~	Fri Aug 25 21:07:28 2000
-+++ texi/gnus.texi	Wed Sep 13 15:50:52 2000
-@@ -1,7 +1,7 @@
- \input texinfo                  @c -*-texinfo-*-  -*- coding: iso-latin-1 -*-
- 
--@setfilename gnus
-+@setfilename gnus.info
- @settitle T-gnus 6.14 Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
diff --git a/news/t-gnus-mule/files/patch-ad b/news/t-gnus-mule/files/patch-ad
deleted file mode 100644
index 85beeda32cbd..000000000000
--- a/news/t-gnus-mule/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- texi/emacs-mime.texi.~1~	Mon May  8 09:21:10 2000
-+++ texi/emacs-mime.texi	Wed Sep 13 15:49:59 2000
-@@ -1,7 +1,7 @@
- \input texinfo                  @c -*-texinfo-*-
- 
--@setfilename emacs-mime
-+@setfilename emacs-mime.info
- @settitle Emacs MIME Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
diff --git a/news/t-gnus-mule/files/patch-ae b/news/t-gnus-mule/files/patch-ae
deleted file mode 100644
index 0311d59a264e..000000000000
--- a/news/t-gnus-mule/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- texi/message.texi.~1~	Mon Jul  3 11:08:29 2000
-+++ texi/message.texi	Wed Sep 13 15:54:38 2000
-@@ -1,7 +1,7 @@
- \input texinfo                  @c -*-texinfo-*-
- 
--@setfilename message
-+@setfilename message.info
- @settitle T-gnus 6.14 Message Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
diff --git a/news/t-gnus-mule/files/patch-af b/news/t-gnus-mule/files/patch-af
deleted file mode 100644
index 0f25f450acaf..000000000000
--- a/news/t-gnus-mule/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- texi/Makefile.in.orig	Mon May  8 09:21:10 2000
-+++ texi/Makefile.in	Wed Sep 13 16:01:57 2000
-@@ -155,7 +155,7 @@
- install:
- 	$(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
- 	@for file in gnus message emacs-mime gnus-ja message-ja; do \
--	  for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-+	  for ifile in `echo $$file.info $$file.info-[0-9] $$file.info-[0-9][0-9]`; do \
- 	    if test -f $$ifile; then \
- 	      echo " $(INSTALL_DATA) $$ifile $(infodir)/$$ifile"; \
- 	      $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
diff --git a/news/t-gnus/Makefile b/news/t-gnus/Makefile
index 6dc88f785cc2..2e095918e345 100644
--- a/news/t-gnus/Makefile
+++ b/news/t-gnus/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MI
 RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 
 HAS_CONFIGURE=	yes
-TGNUSVERSION=	6_14_5-06
+USE_GMAKE=	yes
+TGNUSVERSION=	6_14_6-04
 MIMEUI_PRODUCT?=semi
 MIMEUI_VERSION?=1.13.7
 MIMEUI_PORT_NAME?=${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
@@ -34,7 +35,7 @@ WITHOUT_MULE=yes
 .endif
 
 .if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
-CONFIGURE_ARGS=	--with-xemacs=${EMACS_CMD}
+CONFIGURE_ARGS=	--with-xemacs=${EMACS_CMD} --with-packagedir=${LOCALBASE}/${EMACS_PACKAGESDIR}
 .else
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/t-gnus \
@@ -42,21 +43,20 @@ CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 .endif
 
 .if defined(EMACS_PACKAGESDIR)
-ALL_TARGET=	package
 INFODIR=	${LOCALBASE}/${EMACS_PACKAGESDIR}/info
 STARTUPDIR=	${EMACS_PACKAGESDIR}/lisp
+INFOFILES=	emacs-mime gnus gnus-ja message message-ja
 .if (${EMACS_PORT_NAME} == "xemacs21")
+ALL_TARGET=	package
 INSTALL_TARGET=	install-package
-ALL_TARGET+=	info
 .elif (${EMACS_PORT_NAME} == "xemacs21-mule")
-ALL_TARGET+=	info info-ja
+ALL_TARGET=	package-ja
 INSTALL_TARGET=	install-package-ja
 .endif
 .elif (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule")
-ALL_TARGET=	all info info-ja
-INSTALL_TARGET=	install
+ALL_TARGET=	all-ja
+INSTALL_TARGET=	install-ja
 INFODIR=	${LOCALBASE}/info
-INFOFILES=	emacs-mime.info gnus.info gnus-ja.info message.info message-ja.info
 STARTUPDIR=	${EMACS_SITE_LISPDIR}
 .endif
 
@@ -94,16 +94,14 @@ post-install:
 .endfor
 .endif
 	${INSTALL_DATA} ${WRKDIR}/t-gnus-startup.el ${PREFIX}/${STARTUPDIR}
-.if (${EMACS_PORT_NAME} == "emacs20")
+# For XEmacs, ${INFODIR}/dir is not necessary.
+.if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
 .for file in ${INFOFILES}
-	install-info ${INFODIR}/${file} ${INFODIR}/dir
+	 install-info --delete ${INFODIR}/${file} ${INFODIR}/dir
 .endfor
-.elif (${EMACS_PORT_NAME} == "mule")
-	install-info --section=${DIRSECTION} ${INFODIR}/emacs-mime.info --entry="* Emacs MIME: (emacs-mime.info). The MIME de/composition library." ${INFODIR}/dir
-	install-info --section=${DIRSECTION} ${INFODIR}/gnus.info --entry="* Gnus: (gnus.info).   The news reader gnus" ${INFODIR}/dir
-	install-info --section=${DIRSECTION} ${INFODIR}/gnus-ja.info --entry="* Gnus-ja: (gnus-ja.info).   The news reader gnus" ${INFODIR}/dir
-	install-info --section=${DIRSECTION} ${INFODIR}/message.info --entry="* Message: (message.info).   Mail and news composition mode that goes with Gnus." ${INFODIR}/dir
-	install-info --section=${DIRSECTION} ${INFODIR}/message-ja.info --entry="* Message-ja: (message-ja.info).   Mail and news composition mode that goes with Gnus." ${INFODIR}/dir
+	if [ `${GREP} '^*' ${INFODIR}/dir | wc -l` -eq 1 ]; then \
+		${RM} ${INFODIR}/dir; \
+	fi
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/news/t-gnus/distinfo b/news/t-gnus/distinfo
index a995220d99ed..5a32ba9cf2d7 100644
--- a/news/t-gnus/distinfo
+++ b/news/t-gnus/distinfo
@@ -1 +1 @@
-MD5 (t-gnus-6_14_5-06.tar.gz) = 77764050381d208aaf1843f6c98f2678
+MD5 (t-gnus-6_14_6-04.tar.gz) = a0a8d55a688842e4f304505604e43248
diff --git a/news/t-gnus/files/patch-aa b/news/t-gnus/files/patch-aa
deleted file mode 100644
index 295f28112c58..000000000000
--- a/news/t-gnus/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- texi/gnus-ja.texi.orig	Fri Aug 25 21:07:28 2000
-+++ texi/gnus-ja.texi	Wed Sep 13 15:18:32 2000
-@@ -1,13 +1,15 @@
- @c \input texinfo @c -*- mode: texinfo; coding: iso-2022-7bit-ss2; -*-
- 
--@setfilename gnus-ja
-+@setfilename gnus-ja.info
- @settitle T-gnus 6.14 Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
--@c @direntry
--@c * Gnus-ja: (gnus-ja).   The news reader gnus (日本語版).
--@c @end direntry
-+@ifinfo
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Gnus-ja: (gnus-ja.info).  The news reader gnus (日本語版).
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/news/t-gnus/files/patch-ab b/news/t-gnus/files/patch-ab
deleted file mode 100644
index 2bd1d1f17d6e..000000000000
--- a/news/t-gnus/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- texi/message-ja.texi.orig	Mon May  8 09:21:25 2000
-+++ texi/message-ja.texi	Wed Sep 13 15:16:41 2000
-@@ -1,13 +1,15 @@
- \input texinfo                  @c -*-texinfo-*-
- 
--@setfilename message-ja
-+@setfilename message-ja.info
- @settitle T-gnus 6.14 Message Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
--@c @direntry
--@c * Message: (message).   Mail and news composition mode that goes with Gnus.
--@c @end direntry
-+@ifinfo
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message-ja: (message-ja.info).   Mail and news composition mode that goes with Gnus.
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/news/t-gnus/files/patch-ac b/news/t-gnus/files/patch-ac
deleted file mode 100644
index f3f32caa907d..000000000000
--- a/news/t-gnus/files/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- texi/gnus.texi.~1~	Fri Aug 25 21:07:28 2000
-+++ texi/gnus.texi	Wed Sep 13 15:50:52 2000
-@@ -1,13 +1,14 @@
- \input texinfo                  @c -*-texinfo-*-  -*- coding: iso-latin-1 -*-
- 
--@setfilename gnus
-+@setfilename gnus.info
- @settitle T-gnus 6.14 Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
--@c @direntry
--@c * Gnus: (gnus).         The newsreader Gnus.
--@c @end direntry
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Gnus: (gnus.info).       The newsreader Gnus.
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/news/t-gnus/files/patch-ad b/news/t-gnus/files/patch-ad
deleted file mode 100644
index 28eda18ca3c0..000000000000
--- a/news/t-gnus/files/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
---- texi/emacs-mime.texi.~1~	Mon May  8 09:21:10 2000
-+++ texi/emacs-mime.texi	Wed Sep 13 15:49:59 2000
-@@ -1,13 +1,14 @@
- \input texinfo                  @c -*-texinfo-*-
- 
--@setfilename emacs-mime
-+@setfilename emacs-mime.info
- @settitle Emacs MIME Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
--@c @direntry
--@c * Emacs MIME: (emacs-mime).   The MIME de/composition library.
--@c @end direntry
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Emacs MIME: (emacs-mime.info). The MIME de/composition library.
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/news/t-gnus/files/patch-ae b/news/t-gnus/files/patch-ae
deleted file mode 100644
index d6e2b15e7b1c..000000000000
--- a/news/t-gnus/files/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
---- texi/message.texi.~1~	Mon Jul  3 11:08:29 2000
-+++ texi/message.texi	Wed Sep 13 15:54:38 2000
-@@ -1,13 +1,14 @@
- \input texinfo                  @c -*-texinfo-*-
- 
--@setfilename message
-+@setfilename message.info
- @settitle T-gnus 6.14 Message Manual
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
--@c @direntry
--@c * Message: (message).   Mail and news composition mode that goes with Gnus.
--@c @end direntry
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message: (message.info). Mail and news composition mode that goes with Gnus.
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/news/t-gnus/files/patch-af b/news/t-gnus/files/patch-af
deleted file mode 100644
index 0f25f450acaf..000000000000
--- a/news/t-gnus/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- texi/Makefile.in.orig	Mon May  8 09:21:10 2000
-+++ texi/Makefile.in	Wed Sep 13 16:01:57 2000
-@@ -155,7 +155,7 @@
- install:
- 	$(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
- 	@for file in gnus message emacs-mime gnus-ja message-ja; do \
--	  for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-+	  for ifile in `echo $$file.info $$file.info-[0-9] $$file.info-[0-9][0-9]`; do \
- 	    if test -f $$ifile; then \
- 	      echo " $(INSTALL_DATA) $$ifile $(infodir)/$$ifile"; \
- 	      $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
diff --git a/news/t-gnus/pkg-plist.emacs20 b/news/t-gnus/pkg-plist.emacs20
index 6592f6c31c14..f4e5cb7bcdbf 100644
--- a/news/t-gnus/pkg-plist.emacs20
+++ b/news/t-gnus/pkg-plist.emacs20
@@ -1,10 +1,6 @@
-%%EMACS_SITE_LISPDIR%%/t-gnus/base64.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/base64.elc
+%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/binhex.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/binhex.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/dgnushack.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/drums.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/drums.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/earcon.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/earcon.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.el
@@ -19,7 +15,6 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bbdb.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.el
@@ -58,6 +53,8 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
+%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.el
@@ -70,7 +67,6 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-picon.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.el
@@ -103,26 +99,22 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-xmas.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/imap.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/imap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/lpath.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mailheader.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mailheader.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/md5.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/md5.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/message.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/message.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/messagexmas.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.el
@@ -163,12 +155,10 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheaderxm.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnlistserv.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.el
@@ -181,18 +171,14 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnslashdot.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nntp.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nntp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnultimate.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnwarchive.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnweb.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/pop3.el
@@ -213,15 +199,14 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/smiley.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/time-date.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/time-date.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/utf7.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/utf7.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/webmail.el
-%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
@@ -239,49 +224,50 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
-@unexec install-info --delete %D/%%INFODIR%%/emacs-mime.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus-ja.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message-ja.info %D/%%INFODIR%%/dir
-%%INFODIR%%/emacs-mime.info
-%%INFODIR%%/gnus.info
-%%INFODIR%%/gnus.info-1
-%%INFODIR%%/gnus.info-10
-%%INFODIR%%/gnus.info-11
-%%INFODIR%%/gnus.info-12
-%%INFODIR%%/gnus.info-13
-%%INFODIR%%/gnus.info-14
-%%INFODIR%%/gnus.info-15
-%%INFODIR%%/gnus.info-16
-%%INFODIR%%/gnus.info-17
-%%INFODIR%%/gnus.info-18
-%%INFODIR%%/gnus.info-2
-%%INFODIR%%/gnus.info-3
-%%INFODIR%%/gnus.info-4
-%%INFODIR%%/gnus.info-5
-%%INFODIR%%/gnus.info-6
-%%INFODIR%%/gnus.info-7
-%%INFODIR%%/gnus.info-8
-%%INFODIR%%/gnus.info-9
-%%INFODIR%%/gnus-ja.info
-%%INFODIR%%/gnus-ja.info-1
-%%INFODIR%%/gnus-ja.info-10
-%%INFODIR%%/gnus-ja.info-11
-%%INFODIR%%/gnus-ja.info-2
-%%INFODIR%%/gnus-ja.info-3
-%%INFODIR%%/gnus-ja.info-4
-%%INFODIR%%/gnus-ja.info-5
-%%INFODIR%%/gnus-ja.info-6
-%%INFODIR%%/gnus-ja.info-7
-%%INFODIR%%/gnus-ja.info-8
-%%INFODIR%%/gnus-ja.info-9
-%%INFODIR%%/message.info
-%%INFODIR%%/message-ja.info
-@exec install-info %D/%%INFODIR%%/emacs-mime.info %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/gnus.info %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/gnus-ja.info %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/message.info %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/message-ja.info %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
+%%INFODIR%%/emacs-mime
+%%INFODIR%%/gnus
+%%INFODIR%%/gnus-1
+%%INFODIR%%/gnus-10
+%%INFODIR%%/gnus-11
+%%INFODIR%%/gnus-12
+%%INFODIR%%/gnus-13
+%%INFODIR%%/gnus-14
+%%INFODIR%%/gnus-15
+%%INFODIR%%/gnus-16
+%%INFODIR%%/gnus-17
+%%INFODIR%%/gnus-18
+%%INFODIR%%/gnus-2
+%%INFODIR%%/gnus-3
+%%INFODIR%%/gnus-4
+%%INFODIR%%/gnus-5
+%%INFODIR%%/gnus-6
+%%INFODIR%%/gnus-7
+%%INFODIR%%/gnus-8
+%%INFODIR%%/gnus-9
+%%INFODIR%%/gnus-ja
+%%INFODIR%%/gnus-ja-1
+%%INFODIR%%/gnus-ja-10
+%%INFODIR%%/gnus-ja-11
+%%INFODIR%%/gnus-ja-12
+%%INFODIR%%/gnus-ja-2
+%%INFODIR%%/gnus-ja-3
+%%INFODIR%%/gnus-ja-4
+%%INFODIR%%/gnus-ja-5
+%%INFODIR%%/gnus-ja-6
+%%INFODIR%%/gnus-ja-7
+%%INFODIR%%/gnus-ja-8
+%%INFODIR%%/gnus-ja-9
+%%INFODIR%%/message
+%%INFODIR%%/message-ja
+@exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
 @dirrm %%EMACS_SITE_LISPDIR%%/t-gnus
 @dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%
diff --git a/news/t-gnus/pkg-plist.mule b/news/t-gnus/pkg-plist.mule
index 992062a32793..8ebab2d828a6 100644
--- a/news/t-gnus/pkg-plist.mule
+++ b/news/t-gnus/pkg-plist.mule
@@ -1,10 +1,8 @@
+%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/base64.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/base64.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/binhex.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/binhex.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/dgnushack.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/drums.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/drums.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/earcon.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/earcon.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.el
@@ -19,7 +17,6 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bbdb.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.el
@@ -58,6 +55,8 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
+%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.el
@@ -70,7 +69,6 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-picon.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.el
@@ -103,26 +101,22 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-xmas.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/gnus.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/imap.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/imap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/lpath.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mailheader.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mailheader.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/md5.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/md5.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/message.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/message.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/messagexmas.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.el
@@ -163,12 +157,10 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheaderxm.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnlistserv.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.el
@@ -181,18 +173,14 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnslashdot.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/nntp.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nntp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnultimate.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnwarchive.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnweb.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/pop3.el
@@ -213,15 +201,14 @@
 %%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/smiley.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.el
+%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/time-date.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/time-date.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/utf7.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/utf7.elc
 %%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.el
 %%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/webmail.el
-%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
@@ -239,56 +226,57 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
-@unexec install-info --delete %D/%%INFODIR%%/emacs-mime.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus-ja.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message.info %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message-ja.info %D/%%INFODIR%%/dir
-%%INFODIR%%/emacs-mime.info
-%%INFODIR%%/gnus.info
-%%INFODIR%%/gnus.info-1
-%%INFODIR%%/gnus.info-10
-%%INFODIR%%/gnus.info-11
-%%INFODIR%%/gnus.info-12
-%%INFODIR%%/gnus.info-13
-%%INFODIR%%/gnus.info-14
-%%INFODIR%%/gnus.info-15
-%%INFODIR%%/gnus.info-16
-%%INFODIR%%/gnus.info-17
-%%INFODIR%%/gnus.info-18
-%%INFODIR%%/gnus.info-2
-%%INFODIR%%/gnus.info-3
-%%INFODIR%%/gnus.info-4
-%%INFODIR%%/gnus.info-5
-%%INFODIR%%/gnus.info-6
-%%INFODIR%%/gnus.info-7
-%%INFODIR%%/gnus.info-8
-%%INFODIR%%/gnus.info-9
-%%INFODIR%%/gnus-ja.info
-%%INFODIR%%/gnus-ja.info-1
-%%INFODIR%%/gnus-ja.info-10
-%%INFODIR%%/gnus-ja.info-11
-%%INFODIR%%/gnus-ja.info-12
-%%INFODIR%%/gnus-ja.info-13
-%%INFODIR%%/gnus-ja.info-14
-%%INFODIR%%/gnus-ja.info-15
-%%INFODIR%%/gnus-ja.info-16
-%%INFODIR%%/gnus-ja.info-17
-%%INFODIR%%/gnus-ja.info-18
-%%INFODIR%%/gnus-ja.info-2
-%%INFODIR%%/gnus-ja.info-3
-%%INFODIR%%/gnus-ja.info-4
-%%INFODIR%%/gnus-ja.info-5
-%%INFODIR%%/gnus-ja.info-6
-%%INFODIR%%/gnus-ja.info-7
-%%INFODIR%%/gnus-ja.info-8
-%%INFODIR%%/gnus-ja.info-9
-%%INFODIR%%/message.info
-%%INFODIR%%/message-ja.info
-@exec install-info --section="%%DIRSECTION%%" %D/%%INFODIR%%/emacs-mime.info --entry="* Emacs MIME: (emacs-mime.info). The MIME de/composition library." %D/%%INFODIR%%/dir
-@exec install-info --section="%%DIRSECTION%%" %D/%%INFODIR%%/gnus.info --entry="* Gnus: (gnus.info).   The news reader gnus" %D/%%INFODIR%%/dir
-@exec install-info --section="%%DIRSECTION%%" %D/%%INFODIR%%/gnus-ja.info --entry="* Gnus-ja: (gnus-ja.info).   The news reader gnus" %D/%%INFODIR%%/dir
-@exec install-info --section="%%DIRSECTION%%" %D/%%INFODIR%%/message.info --entry="* Message: (message.info).   Mail and news composition mode that goes with Gnus." %D/%%INFODIR%%/dir
-@exec install-info --section="%%DIRSECTION%%" %D/%%INFODIR%%/message-ja.info --entry="* Message-ja: (message-ja.info).   Mail and news composition mode that goes with Gnus." %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
+%%INFODIR%%/emacs-mime
+%%INFODIR%%/gnus
+%%INFODIR%%/gnus-1
+%%INFODIR%%/gnus-10
+%%INFODIR%%/gnus-11
+%%INFODIR%%/gnus-12
+%%INFODIR%%/gnus-13
+%%INFODIR%%/gnus-14
+%%INFODIR%%/gnus-15
+%%INFODIR%%/gnus-16
+%%INFODIR%%/gnus-17
+%%INFODIR%%/gnus-18
+%%INFODIR%%/gnus-2
+%%INFODIR%%/gnus-3
+%%INFODIR%%/gnus-4
+%%INFODIR%%/gnus-5
+%%INFODIR%%/gnus-6
+%%INFODIR%%/gnus-7
+%%INFODIR%%/gnus-8
+%%INFODIR%%/gnus-9
+%%INFODIR%%/gnus-ja
+%%INFODIR%%/gnus-ja-1
+%%INFODIR%%/gnus-ja-10
+%%INFODIR%%/gnus-ja-11
+%%INFODIR%%/gnus-ja-12
+%%INFODIR%%/gnus-ja-13
+%%INFODIR%%/gnus-ja-14
+%%INFODIR%%/gnus-ja-15
+%%INFODIR%%/gnus-ja-16
+%%INFODIR%%/gnus-ja-17
+%%INFODIR%%/gnus-ja-18
+%%INFODIR%%/gnus-ja-19
+%%INFODIR%%/gnus-ja-2
+%%INFODIR%%/gnus-ja-3
+%%INFODIR%%/gnus-ja-4
+%%INFODIR%%/gnus-ja-5
+%%INFODIR%%/gnus-ja-6
+%%INFODIR%%/gnus-ja-7
+%%INFODIR%%/gnus-ja-8
+%%INFODIR%%/gnus-ja-9
+%%INFODIR%%/message
+%%INFODIR%%/message-ja
+@exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
 @dirrm %%EMACS_SITE_LISPDIR%%/t-gnus
 @dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%
diff --git a/news/t-gnus/pkg-plist.xemacs21-mule b/news/t-gnus/pkg-plist.xemacs21-mule
index 5d89e74cb0d8..d0c73fb88a89 100644
--- a/news/t-gnus/pkg-plist.xemacs21-mule
+++ b/news/t-gnus/pkg-plist.xemacs21-mule
@@ -1,3 +1,4 @@
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus-startup.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/base64.el
@@ -6,9 +7,6 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/binhex.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/custom-load.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/dgnushack.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/drums.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/drums.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/earcon.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/earcon.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/flow-fill.el
@@ -63,6 +61,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mailcap.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mh.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mh.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ml.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ml.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mlspl.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mlspl.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-move.el
@@ -117,16 +117,12 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/ietf-drums.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/imap.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/imap.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/lpath.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-parse.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-parse.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-prsvr.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-prsvr.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-source.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-source.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mailheader.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mailheader.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/md5.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/message.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/message.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/messagexmas.el
@@ -207,6 +203,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnwarchive.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnweb.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnweb.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnwfm.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnwfm.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/parse-time.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/parse-time.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/pop3.el
@@ -229,6 +227,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/score-mode.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/smiley.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/smiley.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/starttls.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/starttls.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/time-date.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/time-date.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/utf7.el
@@ -237,7 +237,6 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/uudecode.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/webmail.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/webmail.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus-startup.el
 %%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.t-gnus
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
@@ -280,6 +279,7 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 %%INFODIR%%/gnus-ja.info-1
 %%INFODIR%%/gnus-ja.info-10
 %%INFODIR%%/gnus-ja.info-11
+%%INFODIR%%/gnus-ja.info-12
 %%INFODIR%%/gnus-ja.info-2
 %%INFODIR%%/gnus-ja.info-3
 %%INFODIR%%/gnus-ja.info-4