Merge branch '5.5' into 10.1

58 files changed, 59 insertions, 59 deletions

diff --git a/extra/readline/CMakeLists.txt b/extra/readline/CMakeLists.txt
index bdecdd1fcce..9a02d9b8247 100644
--- a/extra/readline/CMakeLists.txt
+++ b/extra/readline/CMakeLists.txt
@@ -11,7 +11,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335 USA
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/extra/readline/COPYING b/extra/readline/COPYING
index 18e17032a13..7ca98023bb8 100644
--- a/extra/readline/COPYING
+++ b/extra/readline/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/extra/readline/ansi_stdlib.h b/extra/readline/ansi_stdlib.h
index 42ac66ebcc0..3c6da58c42f 100644
--- a/extra/readline/ansi_stdlib.h
+++ b/extra/readline/ansi_stdlib.h
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License along
    with Bash; see the file COPYING.  If not, write to the Free Software
-   Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_STDLIB_H_)
 #define	_STDLIB_H_ 1
diff --git a/extra/readline/bind.c b/extra/readline/bind.c
index d979f244f4d..282053e80e8 100644
--- a/extra/readline/bind.c
+++ b/extra/readline/bind.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #define READLINE_LIBRARY
 
diff --git a/extra/readline/callback.c b/extra/readline/callback.c
index 08c2f0ce80b..df15a65d75e 100644
--- a/extra/readline/callback.c
+++ b/extra/readline/callback.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/chardefs.h b/extra/readline/chardefs.h
index 6aa185d9383..0c3bf833481 100644
--- a/extra/readline/chardefs.h
+++ b/extra/readline/chardefs.h
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #ifndef _CHARDEFS_H_
 #define _CHARDEFS_H_
diff --git a/extra/readline/compat.c b/extra/readline/compat.c
index c16771b8f29..9f9e3f855b6 100644
--- a/extra/readline/compat.c
+++ b/extra/readline/compat.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/complete.c b/extra/readline/complete.c
index b6c20789da4..44bf13821a4 100644
--- a/extra/readline/complete.c
+++ b/extra/readline/complete.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/configure.in b/extra/readline/configure.in
index 949da72933e..067e37ca6d4 100644
--- a/extra/readline/configure.in
+++ b/extra/readline/configure.in
@@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
+# MA 02110-1335  USA.
 
 AC_REVISION([for Readline 5.2, version 2.61])
 
diff --git a/extra/readline/display.c b/extra/readline/display.c
index 4226cdae5a2..b8500f30bcc 100644
--- a/extra/readline/display.c
+++ b/extra/readline/display.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/emacs_keymap.c b/extra/readline/emacs_keymap.c
index a42443f39d6..31e6b49090b 100644
--- a/extra/readline/emacs_keymap.c
+++ b/extra/readline/emacs_keymap.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (BUFSIZ)
 #include <stdio.h>
diff --git a/extra/readline/funmap.c b/extra/readline/funmap.c
index d3a537dfacd..23b3ce19676 100644
--- a/extra/readline/funmap.c
+++ b/extra/readline/funmap.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/histexpand.c b/extra/readline/histexpand.c
index 73286614d55..38292c6045b 100644
--- a/extra/readline/histexpand.c
+++ b/extra/readline/histexpand.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #define READLINE_LIBRARY
 
diff --git a/extra/readline/histfile.c b/extra/readline/histfile.c
index 1d433b98be4..1ad828d4155 100644
--- a/extra/readline/histfile.c
+++ b/extra/readline/histfile.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 /* The goal is to make the implementation transparent, so that you
    don't have to know what data types are used, just what functions
diff --git a/extra/readline/histlib.h b/extra/readline/histlib.h
index 4418f537389..4d63ca7440c 100644
--- a/extra/readline/histlib.h
+++ b/extra/readline/histlib.h
@@ -17,7 +17,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_HISTLIB_H_)
 #define _HISTLIB_H_
diff --git a/extra/readline/history.c b/extra/readline/history.c
index f36bbe4bc53..a777229248c 100644
--- a/extra/readline/history.c
+++ b/extra/readline/history.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 /* The goal is to make the implementation transparent, so that you
    don't have to know what data types are used, just what functions
diff --git a/extra/readline/history.h b/extra/readline/history.h
index c196b0361e3..dd8169dc51b 100644
--- a/extra/readline/history.h
+++ b/extra/readline/history.h
@@ -17,7 +17,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #ifndef _HISTORY_H_
 #define _HISTORY_H_
diff --git a/extra/readline/histsearch.c b/extra/readline/histsearch.c
index dcf6b420b1b..43cac20a18a 100644
--- a/extra/readline/histsearch.c
+++ b/extra/readline/histsearch.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #define READLINE_LIBRARY
 
diff --git a/extra/readline/input.c b/extra/readline/input.c
index 3f8eb65c07d..e88df08a299 100644
--- a/extra/readline/input.c
+++ b/extra/readline/input.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (__TANDEM)
diff --git a/extra/readline/isearch.c b/extra/readline/isearch.c
index 83829f4861c..750113f5dd8 100644
--- a/extra/readline/isearch.c
+++ b/extra/readline/isearch.c
@@ -23,7 +23,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/keymaps.c b/extra/readline/keymaps.c
index 17436cf20bf..f431b9daaed 100644
--- a/extra/readline/keymaps.c
+++ b/extra/readline/keymaps.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/keymaps.h b/extra/readline/keymaps.h
index 1de567ddc1e..64bd4c14c39 100644
--- a/extra/readline/keymaps.h
+++ b/extra/readline/keymaps.h
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #ifndef _KEYMAPS_H_
 #define _KEYMAPS_H_
diff --git a/extra/readline/kill.c b/extra/readline/kill.c
index bfe6afe77fe..accda438537 100644
--- a/extra/readline/kill.c
+++ b/extra/readline/kill.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/macro.c b/extra/readline/macro.c
index 7a26fc40c97..0dd02fd139d 100644
--- a/extra/readline/macro.c
+++ b/extra/readline/macro.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/mbutil.c b/extra/readline/mbutil.c
index b3d5c1b0ea4..1d6d8bbf9a2 100644
--- a/extra/readline/mbutil.c
+++ b/extra/readline/mbutil.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/misc.c b/extra/readline/misc.c
index 033a0dd9482..6d5f2732a79 100644
--- a/extra/readline/misc.c
+++ b/extra/readline/misc.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/nls.c b/extra/readline/nls.c
index ddfca55d62d..089ef8a6abd 100644
--- a/extra/readline/nls.c
+++ b/extra/readline/nls.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/parens.c b/extra/readline/parens.c
index 6b2a4d8d263..d9390e41b1e 100644
--- a/extra/readline/parens.c
+++ b/extra/readline/parens.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (__TANDEM)
diff --git a/extra/readline/posixdir.h b/extra/readline/posixdir.h
index fe4cb231173..156ad363872 100644
--- a/extra/readline/posixdir.h
+++ b/extra/readline/posixdir.h
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 /* This file should be included instead of <dirent.h> or <sys/dir.h>. */
 
diff --git a/extra/readline/posixjmp.h b/extra/readline/posixjmp.h
index a2c89b83d4e..94af2bd11a8 100644
--- a/extra/readline/posixjmp.h
+++ b/extra/readline/posixjmp.h
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #ifndef _POSIXJMP_H_
 #define _POSIXJMP_H_
diff --git a/extra/readline/posixstat.h b/extra/readline/posixstat.h
index d3eca09b634..e0957260806 100644
--- a/extra/readline/posixstat.h
+++ b/extra/readline/posixstat.h
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 /* This file should be included instead of <sys/stat.h>.
    It relies on the local sys/stat.h to work though. */
diff --git a/extra/readline/readline.c b/extra/readline/readline.c
index d2e710875dc..77e8e17c216 100644
--- a/extra/readline/readline.c
+++ b/extra/readline/readline.c
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/readline.h b/extra/readline/readline.h
index 867b2e71641..ace11f7c96e 100644
--- a/extra/readline/readline.h
+++ b/extra/readline/readline.h
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_READLINE_H_)
 #define _READLINE_H_
diff --git a/extra/readline/rlconf.h b/extra/readline/rlconf.h
index 4aacbb9e7f4..57103da7dc1 100644
--- a/extra/readline/rlconf.h
+++ b/extra/readline/rlconf.h
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_RLCONF_H_)
 #define _RLCONF_H_
diff --git a/extra/readline/rldefs.h b/extra/readline/rldefs.h
index 732bd54baa9..f8334bd4566 100644
--- a/extra/readline/rldefs.h
+++ b/extra/readline/rldefs.h
@@ -21,7 +21,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_RLDEFS_H_)
 #define _RLDEFS_H_
diff --git a/extra/readline/rlmbutil.h b/extra/readline/rlmbutil.h
index 63c4055f9f4..3e8fa2221cf 100644
--- a/extra/readline/rlmbutil.h
+++ b/extra/readline/rlmbutil.h
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_RL_MBUTIL_H_)
 #define _RL_MBUTIL_H_
diff --git a/extra/readline/rlprivate.h b/extra/readline/rlprivate.h
index a693bd988b6..cf3d2038194 100644
--- a/extra/readline/rlprivate.h
+++ b/extra/readline/rlprivate.h
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_RL_PRIVATE_H_)
 #define _RL_PRIVATE_H_
diff --git a/extra/readline/rlshell.h b/extra/readline/rlshell.h
index 629b0e03b46..8d5db8893b5 100644
--- a/extra/readline/rlshell.h
+++ b/extra/readline/rlshell.h
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_RL_SHELL_H_)
 #define _RL_SHELL_H_
diff --git a/extra/readline/rlstdc.h b/extra/readline/rlstdc.h
index 2a2272895ce..1bcaff3eef2 100644
--- a/extra/readline/rlstdc.h
+++ b/extra/readline/rlstdc.h
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_RL_STDC_H_)
 #define _RL_STDC_H_
diff --git a/extra/readline/rltty.c b/extra/readline/rltty.c
index ca8caee7de7..0efacf18ff2 100644
--- a/extra/readline/rltty.c
+++ b/extra/readline/rltty.c
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/rltty.h b/extra/readline/rltty.h
index 3a4770d25cb..3fa38bb9e40 100644
--- a/extra/readline/rltty.h
+++ b/extra/readline/rltty.h
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_RLTTY_H_)
 #define _RLTTY_H_
diff --git a/extra/readline/rltypedefs.h b/extra/readline/rltypedefs.h
index 2a0773b0672..2331662274b 100644
--- a/extra/readline/rltypedefs.h
+++ b/extra/readline/rltypedefs.h
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #ifndef _RL_TYPEDEFS_H_
 #define _RL_TYPEDEFS_H_
diff --git a/extra/readline/rlwinsize.h b/extra/readline/rlwinsize.h
index ad671693c7b..14a1f8bfafb 100644
--- a/extra/readline/rlwinsize.h
+++ b/extra/readline/rlwinsize.h
@@ -20,7 +20,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_RLWINSIZE_H_)
 #define _RLWINSIZE_H_
diff --git a/extra/readline/savestring.c b/extra/readline/savestring.c
index 9c431a0e852..2a9ad425c8e 100644
--- a/extra/readline/savestring.c
+++ b/extra/readline/savestring.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #include "config_readline.h"
diff --git a/extra/readline/search.c b/extra/readline/search.c
index cf50a7cc499..9345be4f5bc 100644
--- a/extra/readline/search.c
+++ b/extra/readline/search.c
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/shell.c b/extra/readline/shell.c
index d67f3e65017..3b331e927c8 100644
--- a/extra/readline/shell.c
+++ b/extra/readline/shell.c
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/signals.c b/extra/readline/signals.c
index db392b3dcc4..cda33b7c7c2 100644
--- a/extra/readline/signals.c
+++ b/extra/readline/signals.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/tcap.h b/extra/readline/tcap.h
index d1e212869ce..28ec669b356 100644
--- a/extra/readline/tcap.h
+++ b/extra/readline/tcap.h
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_RLTCAP_H_)
 #define _RLTCAP_H_
diff --git a/extra/readline/terminal.c b/extra/readline/terminal.c
index 43086d42e2d..27397c8208a 100644
--- a/extra/readline/terminal.c
+++ b/extra/readline/terminal.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/text.c b/extra/readline/text.c
index 90ad7787000..c9cceac96eb 100644
--- a/extra/readline/text.c
+++ b/extra/readline/text.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/tilde.c b/extra/readline/tilde.c
index 3d84fd4815a..aace95d783e 100644
--- a/extra/readline/tilde.c
+++ b/extra/readline/tilde.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if defined (HAVE_CONFIG_H)
 #  include "config_readline.h"
diff --git a/extra/readline/tilde.h b/extra/readline/tilde.h
index 6060ec6506d..56986c9741e 100644
--- a/extra/readline/tilde.h
+++ b/extra/readline/tilde.h
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_TILDE_H_)
 #  define _TILDE_H_
diff --git a/extra/readline/undo.c b/extra/readline/undo.c
index 6b217e45e35..f9931b4aabe 100644
--- a/extra/readline/undo.c
+++ b/extra/readline/undo.c
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/util.c b/extra/readline/util.c
index 7c98bcaaefe..fafb5d8a1ac 100644
--- a/extra/readline/util.c
+++ b/extra/readline/util.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/vi_keymap.c b/extra/readline/vi_keymap.c
index 85a90fe7086..89acdf22e67 100644
--- a/extra/readline/vi_keymap.c
+++ b/extra/readline/vi_keymap.c
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (BUFSIZ)
 #include <stdio.h>
diff --git a/extra/readline/vi_mode.c b/extra/readline/vi_mode.c
index 7a7dda760df..cae0b29e1ea 100644
--- a/extra/readline/vi_mode.c
+++ b/extra/readline/vi_mode.c
@@ -19,7 +19,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 /* **************************************************************** */
diff --git a/extra/readline/xmalloc.c b/extra/readline/xmalloc.c
index 60a142ec1c3..73d760ae1c0 100644
--- a/extra/readline/xmalloc.c
+++ b/extra/readline/xmalloc.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
diff --git a/extra/readline/xmalloc.h b/extra/readline/xmalloc.h
index 58b17f39f3d..5a01449b32b 100644
--- a/extra/readline/xmalloc.h
+++ b/extra/readline/xmalloc.h
@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+   51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA. */
 
 #if !defined (_XMALLOC_H_)
 #define _XMALLOC_H_