diff -up ./elisp/emacs-goodies-el/emacs-goodies-el.texi.fix ./elisp/emacs-goodies-el/emacs-goodies-el.texi
--- ./elisp/emacs-goodies-el/emacs-goodies-el.texi.fix	2010-09-15 23:09:50.243007386 +0530
+++ ./elisp/emacs-goodies-el/emacs-goodies-el.texi	2010-09-15 23:11:07.221007839 +0530
@@ -3,14 +3,14 @@
 
 @c $Id: emacs-goodies-el.texi,v 1.99 2010-06-23 12:58:30 psg Exp $
 @c %**start of header
-@setfilename info/emacs-goodies-el
-@settitle Emacs-Goodies-el
-@documentencoding ISO-8859-1
+@setfilename info/emacs-goodies
+@settitle emacs-goodies
+@documentencoding utf-8
 @c %**end of header
 
 @dircategory Emacs
 @direntry
-* Emacs-Goodies-el: (emacs-goodies-el). Miscellaneous add-ons for Emacs
+* emacs-goodies: (emacs-goodies). Miscellaneous add-ons for Emacs
 @end direntry
 
 @c Version variables.
@@ -19,27 +19,27 @@
 
 @ifinfo
 This is Edition @value{EDITION}, last updated @value{UPDATED}, of
-@cite{Emacs-Goodies-el}.
+@cite{emacs-goodies}.
 @end ifinfo
 
 @titlepage
-@title Emacs-Goodies-el: Miscellaneous add-ons for Emacs
+@title emacs-goodies: Miscellaneous add-ons for Emacs
 @subtitle A manual for what's in this package.
 @author Peter S. Galbraith
 @end titlepage
 
 @node Top, align-string, (dir), (dir)
-@top The Emacs-Goodies-el Package Setup
+@top The emacs-goodies Package Setup
 
-This manual describes the Emacs-Goodies-el package and its setup.  A
+This manual describes the emacs-goodies package and its setup.  A
 quick descriptions of elisp files contained in this package can be found
-in the file @file{/usr/share/doc/emacs-goodies-el/README.Debian.gz}.
+in the file @file{/usr/share/doc/emacs-goodies/README.Debian.gz}.
 
 All packaged files are installed, setup and ready to use if they don't
 override standard Emacs commands, modes, or settings.
 
 Some extra package installation and setup is done if you customize the
-variable @code{emacs-goodies-el-defaults} to t (its aggressive state).
+variable @code{emacs-goodies-defaults} to t (its aggressive state).
 These will override standard Emacs defaults, but in a good
 (uncontroversial) way.  The affected packages are currently only
 @ref{ff-paths} and @ref{home-end}.  Packages which require activation in
@@ -49,7 +49,7 @@ order to function also include: @ref{bar
 To customize setup of all customizable packages on a finer-grain
 basis, do:
 @example
-@kbd{M-x} customize-group @key{RET} emacs-goodies-el @key{RET}
+@kbd{M-x} customize-group @key{RET} emacs-goodies @key{RET}
 @end example
 
 In the following document, when we speak of customizing a variable, we
@@ -58,7 +58,7 @@ mean to use the Emacs custom interface, 
 @kbd{M-x} customize-variable @key{RET} some-variable @key{RET}
 @end example
 When we speak of customizing a group, it's as the example above for the
-group @code{emacs-goodies-el}.
+group @code{emacs-goodies}.
 
 The following files are documented so far.  Eventually, all files will
 be documented.
@@ -173,7 +173,7 @@ session - Session Management for Emacs
 @end menu
 
 This work compiles GPL'ed documentation from the various elisp files
-in /usr/share/emacs/site-lisp/emacs-goodies-el/.  As a derived work
+in /usr/share/emacs/site-lisp/emacs-goodies/.  As a derived work
 from GPL'ed works, this text is also licensed under the GPL V2 (See
 /usr/share/common-licenses/GPL-2) and is edited by Peter S. Galbraith
 @email{psg@@debian.org}.
@@ -183,7 +183,7 @@ section for usage, but be advised that I
 because I intend to change it.
 
 @table @samp
-@item /usr/share/emacs/site-lisp/emacs-goodies-el/initsplit.el
+@item /usr/share/emacs/site-lisp/emacs-goodies/initsplit.el
 code to split customizations into different files
 @end table
 
@@ -305,7 +305,7 @@ easily though only globally (hence the q
 
 To enable it, customize the variable @code{bar-cursor-mode}.
 
-It is also listed when you customize the group @code{emacs-goodies-el}.
+It is also listed when you customize the group @code{emacs-goodies}.
 
 @node bm, boxquote, bar-cursor, Top
 @chapter bm - visible bookmarks in buffers
@@ -554,7 +554,7 @@ Here is code (from him) to do this:
 (ad-activate 'yank-pop)
 @end example
 
-(The emacs-goodies-el package could add a customizable variable to
+(The emacs-goodies package could add a customizable variable to
 set this up.  Ask if this would be useful. - @email{psg@@debian.org})
 
 Note that the command keeps track of the last window displayed to
@@ -758,7 +758,7 @@ by default.
 
 @noindent Author: Anders Lindgren <andersl@@andersl.com>
 
-To activate this package in the Debian emacs-goodies-el package,
+To activate this package in the Debian emacs-goodies package,
 customize the group @code{ctypes}, toggle on the variable
 @code{ctypes-install} and save for future seesions.  This will enable
 the package.  Then start by using @command{ctypes-buffer} in a C file.
@@ -1049,7 +1049,7 @@ customisation variables described below.
 @key{C-c d w} for running wordinspect GUI dict client.
 @end itemize
 
-The Debian emacs-goodies-el package doesn't setup these keys by
+The Debian emacs-goodies package doesn't setup these keys by
 default.  The first time you use @code{dict} in a session you must do
 so manually with @code{M-x dict}.  Thereafter the keybindings will
 work.  If someone requests it, a customization variable could be added
@@ -1283,7 +1283,7 @@ To use it, customize the variable @code{
 To also enable ffap, customize the variable @code{ff-paths-use-ffap}.
 
 Both of the above are enabled if you customize the variable
-@code{emacs-goodies-el-defaults} to t (its aggressive state).
+@code{emacs-goodies-defaults} to t (its aggressive state).
 
 You may alter various settings of @code{ff-paths} using the
 customization group @code{ff-paths}.
@@ -3258,7 +3258,7 @@ never modified, and you can see the raw 
 You may customize some aspects of this package using @command{M-x
 customize-group rfcview}.
 
-The emacs-goodies-el package sets up Emacs to enter
+The emacs-goodies package sets up Emacs to enter
 @command{rfcview-mode} automatically when reading such a file (as
 recognised by the filename).