diff -aruN G/GNUS-NEWS E/GNUS-NEWS
--- G/GNUS-NEWS	2010-04-16 15:18:55.000000000 +0000
+++ E/GNUS-NEWS	2010-09-04 15:09:11.000000000 +0000
@@ -68,7 +68,7 @@
 
 ** Old intermediate incoming mail files (`Incoming*') are deleted after a
 couple of days, not immediately.  *Note Mail Source Customization::.
-(New in Gnus 5.10.10 / No Gnus 0.8)
+(New in Gnus 5.10.10 / Emacs 22.2)
 
 
 
diff -aruN G/etc/gnus-tut.txt E/etc/gnus-tut.txt
--- G/etc/gnus-tut.txt	2010-04-16 15:18:55.000000000 +0000
+++ E/etc/gnus-tut.txt	2010-09-04 15:09:11.000000000 +0000
@@ -1,5 +1,5 @@
 From lars Thu Feb 23 23:20:38 1995
-From: larsi@gnus.org (ding)
+From: larsi@ifi.uio.no (ding)
 Date: Fri Feb 24 13:40:45 1995
 Subject: So you want to use the new Gnus
 Message-ID: <lars-doc1@eyesore.no>
@@ -22,8 +22,7 @@
 Gnus is a rewrite of GNUS 4.1, written by Masanobu Umeda.  The rewrite
 was done by moi, yours truly, your humble servant, Lars Magne
 Ingebrigtsen.  If you have a WWW browser, you can investigate to your
-heart's delight at <URL:http://www.gnus.org/> and
-<URL:http://quimby.gnus.org/lmi/>.
+heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
 
 ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 ;;   2008, 2009, 2010  Free Software Foundation, Inc.
@@ -47,7 +46,7 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 From lars Thu Feb 23 23:20:38 1995
-From: larsi@gnus.org (ding)
+From: larsi@ifi.uio.no (ding)
 Date: Fri Feb 24 13:40:45 1995
 Subject: Starting up
 Message-ID: <lars-doc2@eyesore.no>
@@ -57,7 +56,7 @@
 the news is to be found, and from *where*.
 
 Say you want to read news from you local, friendly nntp server
-"news.my.local.server". 
+"news.my.local.server".
 
 (setq gnus-select-method '(nntp "news.my.local.server"))
 
@@ -76,7 +75,7 @@
 
 
 From lars Thu Feb 23 23:20:38 1995
-From: larsi@gnus.org (ding)
+From: larsi@ifi.uio.no (ding)
 Date: Fri Feb 24 13:40:45 1995
 Subject: Where are all the groups, then?
 Message-ID: <lars-doc3@eyesore.no>
@@ -109,7 +108,7 @@
 
 
 From lars Thu Feb 23 23:20:38 1995
-From: larsi@gnus.org (ding)
+From: larsi@ifi.uio.no (ding)
 Date: Fri Feb 24 13:40:45 1995
 Subject: I want to read my mail!
 Message-ID: <lars-doc4@eyesore.no>
@@ -132,14 +131,14 @@
 
 (The same for the other methods, kind of.)
 
-You should also set `nnmail-split-methods' to something sensible: 
+You should also set `nnmail-split-methods' to something sensible:
 
-(setq nnmail-split-methods 
+(setq nnmail-split-methods
       '(("mail.junk" "From:.*Lars")
 	("mail.misc "")))
 
 This will put all mail from me in you junk mail group, and the rest in
-"mail.misc". 
+"mail.misc".
 
 These groups will be subscribe the same way as the normal groups, so
 you will probably find them among the zombie groups after you set
@@ -147,16 +146,16 @@
 
 
 From lars Thu Feb 23 23:20:38 1995
-From: larsi@gnus.org (ding)
+From: larsi@ifi.uio.no (ding)
 Date: Fri Feb 24 13:40:45 1995
 Subject: Foreign newsgroups
 Message-ID: <lars-doc5@eyesore.no>
 
-These are groups that do not come from `gnus-select-method'. 
+These are groups that do not come from `gnus-select-method'.
 
 Say you want to read "alt.furniture.couches" from "news.funet.fi".  You
 can then either type `B news.funet.fi <RET>' to browse that server and
-subscribe to that group, or you can type 
+subscribe to that group, or you can type
 `G m alt.furniture.couches<RET>nntp<RET>news.funet.fi<RET>', if you
 like to type a lot.
 
@@ -170,7 +169,7 @@
 
 
 From lars Thu Feb 23 23:20:38 1995
-From: larsi@gnus.org (ding)
+From: larsi@ifi.uio.no (ding)
 Date: Fri Feb 24 13:40:45 1995
 Subject: Low level changes in GNUS, or, Wrong type argument: stringp, nil
 Message-ID: <lars-doc6@eyesore.no>
@@ -178,7 +177,7 @@
 Gnus really isn't GNUS, even though it looks like it.  If you scrape
 the surface, you'll find that most things have changed.
 
-This means that old code that relies on GNUS internals will fail.  
+This means that old code that relies on GNUS internals will fail.
 
 In particular, `gnus-newsrc-hashtb', `gnus-newsrc-assoc',
 `gnus-killed-list', the `nntp-header-' macros and the display formats
@@ -194,11 +193,11 @@
 
 There is absolutely no chance, whatsoever, of getting Gnus to work
 with Emacs 18.  It won't even work on Emacsen older than Emacs
-20.7/XEmacs 21.1.  Upgrade your Emacs or die.
+19.30/XEmacs 19.13.  Upgrade your Emacs or die.
+
 
-	
 From lars Thu Feb 23 23:20:38 1995
-From: larsi@gnus.org (ding)
+From: larsi@ifi.uio.no (ding)
 Date: Fri Feb 24 13:40:45 1995
 Subject: How do I re-scan my mail groups?
 Message-ID: <lars-doc8@eyesore.no>
@@ -212,7 +211,7 @@
 
 
 From lars Thu Feb 23 23:20:38 1995
-From: larsi@gnus.org (ding)
+From: larsi@ifi.uio.no (ding)
 Date: Fri Feb 24 13:40:45 1995
 Subject: How do I set up virtual newsgroups?
 Message-ID: <lars-doc9@eyesore.no>
@@ -226,7 +225,7 @@
 
 This will create the group "nnvirtual:my.virtual.newsgroup", which
 will collect all articles from all the groups in the "rec.aquaria"
-hierarchy.  
+hierarchy.
 
 If you want to edit the regular expression, just type `M-e' on the
 group line.
@@ -258,7 +257,7 @@
 
 (setq gnus-select-group-hook
       (lambda ()
-  	(if (eq 'nnvirtual (car (gnus-find-method-for-group 
+  	(if (eq 'nnvirtual (car (gnus-find-method-for-group
 	                          gnus-newsgroup-name)))
 	    (progn
 	      (make-local-variable 'gnus-thread-sort-functions)
@@ -266,7 +265,7 @@
 
 
 From lars Thu Feb 23 23:20:38 1995
-From: larsi@gnus.org (ding)
+From: larsi@ifi.uio.no (ding)
 Date: Fri Feb 24 13:40:45 1995
 Subject: Bugs & stuff
 Message-ID: <lars-doc7@eyesore.no>
@@ -281,37 +280,14 @@
 When a bug occurs, I need a recipe for how to trigger the bug.  You
 have to tell me exactly what you do to uncover the bug, and you should
 (setq debug-on-error t) and send me the backtrace along with the bug
-report.  
+report.
 
 If I am not able to reproduce the bug, I won't be able to fix it.
 
 I would, of course, prefer that you locate the bug, fix it, and mail
-me the patches, but one can't have everything. 
+me the patches, but one can't have everything.
 
-If you have any questions on usage, the "ding@gnus.org" mailing list
+If you have any questions on usage, the "ding@ifi.uio.no" mailing list
 is where to post the questions.
 
 
-From fschmitt Sat Mar 22 18:13:00 2003
-From: faq@my.gnus.org (Gnus FAQ team)
-Date: Sat Mar 22 18:13:00 2003
-Subject: Gnus FAQ (Frequently Asked Questions)
-Message-ID: <lars-doc9@eyesore.no>
-
-The Gnus FAQ is distributed within the Gnus manual.  The home page of
-the Gnus FAQ is <URL:http://my.gnus.org/FAQ/>, where you can find the
-most recent version in HTML various other formats.
-
-To browse the FAQ now, put the cursor at the end of the following line
-and press `C-x C-e':
-
-  (info "(gnus)Frequently Asked Questions")
-
-On older XEmacs version, use:
-
-  (Info-goto-node "(gnus)Frequently Asked Questions")
-  
-Or simply use RET or the middle mouse button, if the above is displayed
-as a clickable button.
-
-
diff -aruN G/lisp/gnus.el E/lisp/gnus.el
--- G/lisp/gnus.el	2010-09-02 11:34:55.000000000 +0000
+++ E/lisp/gnus.el	2010-09-04 15:09:11.000000000 +0000
@@ -7,6 +7,7 @@
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
+;; Version: 5.13
 
 ;; This file is part of GNU Emacs.
 
@@ -294,10 +295,10 @@
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "0.11"
+(defconst gnus-version-number "5.13"
   "Version number for this version of Gnus.")
 
-(defconst gnus-version (format "No Gnus v%s" gnus-version-number)
+(defconst gnus-version (format "Gnus v%s" gnus-version-number)
   "Version string for this version of Gnus.")
 
 (defcustom gnus-inhibit-startup-message nil
diff -aruN G/lisp/message.el E/lisp/message.el
--- G/lisp/message.el	2010-09-03 12:04:09.000000000 +0000
+++ E/lisp/message.el	2010-09-04 15:09:11.000000000 +0000
@@ -159,7 +159,9 @@
   :group 'message-interface
   :type 'regexp)
 
-(defcustom message-from-style 'default
+(defcustom message-from-style mail-from-style
+;; Default to the value of `mail-from-style', available in all Emacsen
+;; that Gnus supports.
   "*Specifies how \"From\" headers look.
 
 If nil, they contain just the return address like:
@@ -443,7 +445,9 @@
   :link '(custom-manual "(message)Various Commands")
   :group 'message-various)
 
-(defcustom message-interactive t
+(defcustom message-interactive mail-interactive
+;; Default to the value of `mail-interactive', available in all Emacsen
+;; that Gnus supports.
   "Non-nil means when sending a message wait for and display errors.
 A value of nil means let mailer mail back a message to report errors."
   :version "23.2"
@@ -622,21 +626,27 @@
   :type 'regexp)
 
 (defcustom message-cite-prefix-regexp
-  (if (string-match "[[:digit:]]" "1")
-      ;; Support POSIX?  XEmacs 21.5.27 doesn't.
-      "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|}]\\)+"
-    ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
-    (let (non-word-constituents)
-      (with-syntax-table text-mode-syntax-table
-	(setq non-word-constituents
-	      (concat
-	       (if (string-match "\\w" "_")  "" "_")
-	       (if (string-match "\\w" ".")  "" "."))))
-      (if (equal non-word-constituents "")
-	  "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|}]\\)+"
-	(concat "\\([ \t]*\\(\\w\\|["
-		non-word-constituents
-		"]\\)+>+\\|[ \t]*[]>|}]\\)+"))))
+  ;; Default to the value of `mail-citation-prefix-regexp' if available.
+  ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is unavailable
+  ;; unless sendmail.el is loaded.
+  (cond ((boundp 'mail-citation-prefix-regexp)
+	 mail-citation-prefix-regexp)
+	((string-match "[[:digit:]]" "1")
+	 ;; Support POSIX?  XEmacs 21.5.27 doesn't.
+	 "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|}]\\)+")
+	(t
+	 ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
+	 (let (non-word-constituents)
+	   (with-syntax-table text-mode-syntax-table
+	     (setq non-word-constituents
+		   (concat
+		    (if (string-match "\\w" "_")  "" "_")
+		    (if (string-match "\\w" ".")  "" "."))))
+	   (if (equal non-word-constituents "")
+	       "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|}]\\)+"
+	     (concat "\\([ \t]*\\(\\w\\|["
+		     non-word-constituents
+		     "]\\)+>+\\|[ \t]*[]>|}]\\)+")))))
   "*Regexp matching the longest possible citation prefix on a line."
   :version "23.2"
   :group 'message-insertion
@@ -829,7 +839,11 @@
   :link '(custom-manual "(message)Mail Variables")
   :type 'boolean)
 
-(defcustom message-sendmail-envelope-from nil
+(defcustom message-sendmail-envelope-from
+  ;; Default to the value of `mail-envelope-from' if available.
+  ;; Note: as for Emacsen that Gnus supports, except for SXEmacs, it is
+  ;; unavailable unless sendmail.el is loaded.
+  (if (boundp 'mail-envelope-from) mail-envelope-from)
   "*Envelope-from when sending mail with sendmail.
 If this is nil, use `user-mail-address'.  If it is the symbol
 `header', use the From: header of the message."
@@ -1006,7 +1020,10 @@
   :version "23.1" ;; No Gnus
   :group 'message-insertion)
 
-(defcustom message-yank-prefix "> "
+(defcustom message-yank-prefix
+  ;; Default to the value of `mail-yank-prefix' if available.
+  ;; Note: as for Emacs 21, it is unavailable unless sendmail.el is loaded.
+  (if (boundp 'mail-yank-prefix) mail-yank-prefix "> ")
   "*Prefix inserted on the lines of yanked messages.
 Fix `message-cite-prefix-regexp' if it is set to an abnormal value.
 See also `message-yank-cited-prefix' and `message-yank-empty-prefix'."
@@ -1032,7 +1049,11 @@
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
 
-(defcustom message-indentation-spaces 3
+(defcustom message-indentation-spaces
+  ;; Default to the value of `mail-indentation-spaces' if available.
+  ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is unavailable
+  ;; unless sendmail.el is loaded.
+  (if (boundp 'mail-indentation-spaces) mail-indentation-spaces 3)
   "*Number of spaces to insert at the beginning of each cited line.
 Used by `message-yank-original' via `message-yank-cite'."
   :version "23.2"
@@ -1062,7 +1083,9 @@
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
 
-(defcustom message-signature t
+(defcustom message-signature mail-signature
+  ;; Default to the value of `mail-signature', available in all Emacsen
+  ;; that Gnus supports.
   "*String to be inserted at the end of the message buffer.
 If t, the `message-signature-file' file will be inserted instead.
 If a function, the result from the function will be used instead.
@@ -1072,7 +1095,11 @@
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
 
-(defcustom message-signature-file "~/.signature"
+(defcustom message-signature-file
+  ;; Default to the value of `mail-signature-file' if available.
+  ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is unavailable
+  ;; unless sendmail.el is loaded.
+  (if (boundp 'mail-signature-file) mail-signature-file "~/.signature")
   "*Name of file containing the text inserted at end of message buffer.
 Ignored if the named file doesn't exist.
 If nil, don't insert a signature.
diff -aruN G/lisp/parse-time.el E/lisp/parse-time.el
--- G/lisp/parse-time.el	2010-09-02 11:34:55.000000000 +0000
+++ E/lisp/parse-time.el	2010-09-04 15:09:11.826495000 +0000
@@ -37,9 +37,6 @@
 
 (eval-when-compile (require 'cl))	;and ah ain't kiddin' 'bout it
 
-(eval-and-compile
-  (when (featurep 'xemacs)
-    (defvar parse-time-syntax (make-vector 256 nil))))
 (defvar parse-time-digits (make-vector 256 nil))
 
 ;; Byte-compiler warnings
@@ -50,35 +47,18 @@
   (loop for i from ?0 to ?9
     do (aset parse-time-digits i (- i ?0))))
 
-(when (featurep 'xemacs)
-  (unless (aref parse-time-syntax ?0)
-    (loop for i from ?0 to ?9
-	  do (aset parse-time-syntax i ?0))
-    (loop for i from ?A to ?Z
-	  do (aset parse-time-syntax i ?A))
-    (loop for i from ?a to ?z
-	  do (aset parse-time-syntax i ?a))
-    (aset parse-time-syntax ?+ 1)
-    (aset parse-time-syntax ?- -1)
-    (aset parse-time-syntax ?: ?d)))
-
 (defsubst digit-char-p (char)
   (aref parse-time-digits char))
 
-(eval-and-compile
-  (if (featurep 'xemacs)
-      (defsubst parse-time-string-chars (char)
-	(and (< char (length parse-time-syntax))
-	     (aref parse-time-syntax char)))
-    (defsubst parse-time-string-chars (char)
-      (save-match-data
-	(let (case-fold-search str)
-	  (cond ((eq char ?+) 1)
-		((eq char ?-) -1)
-		((eq char ?:) ?d)
-		((string-match "[[:upper:]]" (setq str (string char))) ?A)
-		((string-match "[[:lower:]]" str) ?a)
-		((string-match "[[:digit:]]" str) ?0)))))))
+(defsubst parse-time-string-chars (char)
+  (save-match-data
+    (let (case-fold-search str)
+      (cond ((eq char ?+) 1)
+	    ((eq char ?-) -1)
+	    ((eq char ?:) ?d)
+	    ((string-match "[[:upper:]]" (setq str (string char))) ?A)
+	    ((string-match "[[:lower:]]" str) ?a)
+	    ((string-match "[[:digit:]]" str) ?0)))))
 
 (put 'parse-error 'error-conditions '(parse-error error))
 (put 'parse-error 'error-message "Parsing error")
diff -aruN G/lisp/pgg.el E/lisp/pgg.el
--- G/lisp/pgg.el	2010-09-02 11:34:55.000000000 +0000
+++ E/lisp/pgg.el	2010-09-04 15:09:11.826495000 +0000
@@ -130,7 +130,7 @@
 (put 'pgg-save-coding-system 'lisp-indent-function 2)
 
 (defmacro pgg-save-coding-system (start end &rest body)
-  `(if (interactive-p)
+  `(if (called-interactively-p 'interactive)
        (let ((buffer (current-buffer)))
 	 (with-temp-buffer
 	   (let (buffer-undo-list)
@@ -324,7 +324,7 @@
 	 (pgg-save-coding-system start end
 	   (pgg-invoke "encrypt-region" (or pgg-scheme pgg-default-scheme)
 		       (point-min) (point-max) rcpts sign passphrase))))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (pgg-display-output-buffer start end status))
     status))
 
@@ -340,7 +340,7 @@
 	   (pgg-invoke "encrypt-symmetric-region"
 		       (or pgg-scheme pgg-default-scheme)
 		       (point-min) (point-max) passphrase))))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (pgg-display-output-buffer start end status))
     status))
 
@@ -357,7 +357,7 @@
   (let* ((start (or start (point-min)))
 	 (end (or end (point-max)))
 	 (status (pgg-encrypt-symmetric-region start end passphrase)))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (pgg-display-output-buffer start end status))
     status))
 
@@ -376,7 +376,7 @@
   (let* ((start (or start (point-min)))
 	 (end (or end (point-max)))
 	 (status (pgg-encrypt-region start end rcpts sign passphrase)))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (pgg-display-output-buffer start end status))
     status))
 
@@ -392,7 +392,7 @@
 	  (pgg-save-coding-system start end
 	    (pgg-invoke "decrypt-region" (or pgg-scheme pgg-default-scheme)
 			(point-min) (point-max) passphrase))))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (pgg-display-output-buffer start end status))
     status))
 
@@ -409,7 +409,7 @@
   (let* ((start (or start (point-min)))
 	 (end (or end (point-max)))
 	 (status (pgg-decrypt-region start end passphrase)))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (pgg-display-output-buffer start end status))
     status))
 
@@ -429,9 +429,10 @@
   (let ((status (pgg-save-coding-system start end
 		  (pgg-invoke "sign-region" (or pgg-scheme pgg-default-scheme)
 			      (point-min) (point-max)
-			      (or (interactive-p) cleartext)
+			      (or (called-interactively-p 'interactive)
+				  cleartext)
                               passphrase))))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (pgg-display-output-buffer start end status))
     status))
 
@@ -454,9 +455,10 @@
   (let* ((start (or start (point-min)))
 	 (end (or end (point-max)))
 	 (status (pgg-sign-region start end
-                                  (or (interactive-p) cleartext)
+                                  (or (called-interactively-p 'interactive)
+				      cleartext)
                                   passphrase)))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (pgg-display-output-buffer start end status))
     status))
 
@@ -484,7 +486,7 @@
 	 pgg-query-keyserver
 	 (setq key (concat "0x" (pgg-truncate-key-identifier key)))
 	 (null (pgg-lookup-key key))
-	 (or fetch (interactive-p))
+	 (or fetch (called-interactively-p 'interactive))
 	 (y-or-n-p (format "Key %s not found; attempt to fetch? " key))
 	 (setq keyserver
 	       (or (cdr (assq 'preferred-key-server packet))
@@ -494,7 +496,7 @@
 	  (pgg-save-coding-system start end
 	    (pgg-invoke "verify-region" (or pgg-scheme pgg-default-scheme)
 			(point-min) (point-max) signature)))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (let ((temp-buffer-show-function
 	     (function pgg-temp-buffer-show-function)))
 	(with-output-to-temp-buffer pgg-echo-buffer
@@ -516,7 +518,7 @@
   (let* ((start (or start (point-min)))
 	 (end (or end (point-max)))
 	 (status (pgg-verify-region start end signature fetch)))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (let ((temp-buffer-show-function
 	     (function pgg-temp-buffer-show-function)))
 	(with-output-to-temp-buffer pgg-echo-buffer
diff -aruN G/lisp/time-date.el E/lisp/time-date.el
--- G/lisp/time-date.el	2010-09-02 11:34:55.000000000 +0000
+++ E/lisp/time-date.el	2010-09-04 15:09:11.826495000 +0000
@@ -253,7 +253,7 @@
 	 (month (nth 4 tim))
 	 (day (nth 3 tim))
 	 (year (nth 5 tim)))
-    (+ (time-to-day-in-year time)	;	Days this year
+    (+ (time-to-day-in-year time)	; 	Days this year
        (* 365 (1- year))		;	+ Days in prior years
        (/ (1- year) 4)			;	+ Julian leap years
        (- (/ (1- year) 100))		;	- century years
diff -aruN G/texi/auth.texi E/texi/auth.texi
--- G/texi/auth.texi	2010-09-02 11:34:55.000000000 +0000
+++ E/texi/auth.texi	2010-09-04 15:09:11.000000000 +0000
@@ -1,5 +1,5 @@
 \input texinfo                  @c -*-texinfo-*-
-@setfilename auth
+@setfilename ../../info/auth
 @settitle Emacs auth-source Library @value{VERSION}
 
 @set VERSION 0.2
diff -aruN G/texi/emacs-mime.texi E/texi/emacs-mime.texi
--- G/texi/emacs-mime.texi	2010-09-02 11:34:55.000000000 +0000
+++ E/texi/emacs-mime.texi	2010-09-04 15:09:11.000000000 +0000
@@ -1,6 +1,6 @@
 \input texinfo
 
-@setfilename emacs-mime
+@setfilename ../../info/emacs-mime
 @settitle Emacs MIME Manual
 @synindex fn cp
 @synindex vr cp
diff -aruN G/texi/gnus.texi E/texi/gnus.texi
--- G/texi/gnus.texi	2010-09-04 14:20:29.000000000 +0000
+++ E/texi/gnus.texi	2010-09-04 15:33:59.000000000 +0000
@@ -1,6 +1,6 @@
 \input texinfo
 
-@setfilename gnus
+@setfilename ../../info/gnus
 @settitle Gnus Manual
 @syncodeindex fn cp
 @syncodeindex vr cp
@@ -46,7 +46,7 @@
 \begin{document}
 
 % Adjust ../Makefile.in if you change the following line:
-\newcommand{\gnusversionname}{No Gnus v0.11}
+\newcommand{\gnusversionname}{Gnus v5.13}
 \newcommand{\gnuschaptername}{}
 \newcommand{\gnussectionname}{}
 
@@ -352,7 +352,7 @@
 luck.
 
 @c Adjust ../Makefile.in if you change the following line:
-This manual corresponds to No Gnus v0.11.
+This manual corresponds to Gnus v5.13
 
 @ifnottex
 @insertcopying
@@ -386,7 +386,7 @@
 the program.
 
 @c Adjust ../Makefile.in if you change the following line:
-This manual corresponds to No Gnus v0.11.
+This manual corresponds to Gnus v5.13
 
 @heading Other related manuals
 @itemize
@@ -29191,7 +29191,7 @@
 @item
 Try doing an @kbd{M-x gnus-version}.  If you get something that looks
 like @c
-@samp{No Gnus v0.10} @c Adjust ../Makefile.in if you change this line!
+@samp{Gnus v5.13} @c Adjust ../Makefile.in if you change this line!
 @c
 you have the right files loaded.  Otherwise you have some old @file{.el}
 files lying around.  Delete these.
diff -aruN G/texi/message.texi E/texi/message.texi
--- G/texi/message.texi	2010-09-02 11:34:55.000000000 +0000
+++ E/texi/message.texi	2010-09-04 15:09:11.000000000 +0000
@@ -1,6 +1,6 @@
 \input texinfo                  @c -*-texinfo-*-
 
-@setfilename message
+@setfilename ../../info/message
 @settitle Message Manual
 @synindex fn cp
 @synindex vr cp
@@ -71,7 +71,7 @@
 @c Adjust ../Makefile.in if you change the following lines:
 Message is distributed with Gnus.  The Gnus distribution
 @c
-corresponding to this manual is No Gnus v0.11.
+corresponding to this manual is Gnus v5.13
 
 
 @node Interface
diff -aruN G/texi/pgg.texi E/texi/pgg.texi
--- G/texi/pgg.texi	2010-09-02 11:34:55.000000000 +0000
+++ E/texi/pgg.texi	2010-09-04 15:09:11.000000000 +0000
@@ -1,6 +1,5 @@
 \input texinfo                  @c -*-texinfo-*-
-
-@setfilename pgg
+@setfilename ../../info/pgg
 @settitle PGG @value{VERSION}
 
 @set VERSION 0.1
diff -aruN G/texi/sasl.texi E/texi/sasl.texi
--- G/texi/sasl.texi	2010-09-02 11:34:55.000000000 +0000
+++ E/texi/sasl.texi	2010-09-04 15:09:11.000000000 +0000
@@ -1,6 +1,5 @@
 \input texinfo                  @c -*-texinfo-*-
-
-@setfilename sasl.info
+@setfilename ../../info/sasl
 
 @set VERSION 0.2
 @settitle Emacs SASL Library @value{VERSION}
diff -aruN G/texi/sieve.texi E/texi/sieve.texi
--- G/texi/sieve.texi	2010-09-02 11:34:55.000000000 +0000
+++ E/texi/sieve.texi	2010-09-04 15:09:11.000000000 +0000
@@ -1,6 +1,5 @@
 \input texinfo                  @c -*-texinfo-*-
-
-@setfilename sieve
+@setfilename ../../info/sieve
 @settitle Emacs Sieve Manual
 @synindex fn cp
 @synindex vr cp