Replace FSF snail-mail address with URL.
diff --git a/configure.ac b/configure.ac
index 12f88df..69a2310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,8 +13,7 @@
 dnl
 dnl You should have received a copy of the GNU Library General Public
 dnl License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-dnl If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Fifth Floor, Boston, MA 02110-1301, USA.
+dnl If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.60])
 AC_INIT
diff --git a/include/iconv.h.in b/include/iconv.h.in
index 9dc3c1e..bc98d6f 100644
--- a/include/iconv.h.in
+++ b/include/iconv.h.in
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* When installed, this file is called "iconv.h". */
 
diff --git a/lib/aliases2.h b/lib/aliases2.h
index 7f2dc44..48012b7 100644
--- a/lib/aliases2.h
+++ b/lib/aliases2.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef USE_AIX
diff --git a/lib/armscii_8.h b/lib/armscii_8.h
index 8d1613f..435269c 100644
--- a/lib/armscii_8.h
+++ b/lib/armscii_8.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ascii.h b/lib/ascii.h
index fa49e3b..0f2e10d 100644
--- a/lib/ascii.h
+++ b/lib/ascii.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/atarist.h b/lib/atarist.h
index 90f18cc..78e5cf2 100644
--- a/lib/atarist.h
+++ b/lib/atarist.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/big5.h b/lib/big5.h
index 6237106..b2676b8 100644
--- a/lib/big5.h
+++ b/lib/big5.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/big5_2003.h b/lib/big5_2003.h
index b532ce6..e1420fa 100644
--- a/lib/big5_2003.h
+++ b/lib/big5_2003.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/big5hkscs1999.h b/lib/big5hkscs1999.h
index 9e0d1b0..bdcbfe3 100644
--- a/lib/big5hkscs1999.h
+++ b/lib/big5hkscs1999.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/big5hkscs2001.h b/lib/big5hkscs2001.h
index 2d378c4..8d65d07 100644
--- a/lib/big5hkscs2001.h
+++ b/lib/big5hkscs2001.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/big5hkscs2004.h b/lib/big5hkscs2004.h
index 3c57f66..4e5a03d 100644
--- a/lib/big5hkscs2004.h
+++ b/lib/big5hkscs2004.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/big5hkscs2008.h b/lib/big5hkscs2008.h
index 8759f4d..afa51b5 100644
--- a/lib/big5hkscs2008.h
+++ b/lib/big5hkscs2008.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/c99.h b/lib/c99.h
index 52a73c3..1eb9efb 100644
--- a/lib/c99.h
+++ b/lib/c99.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ces_big5.h b/lib/ces_big5.h
index 2f87735..549ec13 100644
--- a/lib/ces_big5.h
+++ b/lib/ces_big5.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ces_gbk.h b/lib/ces_gbk.h
index 69e61f7..0e35d65 100644
--- a/lib/ces_gbk.h
+++ b/lib/ces_gbk.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cjk_variants.h b/lib/cjk_variants.h
index 23cb4b3..3261c86 100644
--- a/lib/cjk_variants.h
+++ b/lib/cjk_variants.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643.h b/lib/cns11643.h
index 5b16641..f11a3a2 100644
--- a/lib/cns11643.h
+++ b/lib/cns11643.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_1.h b/lib/cns11643_1.h
index 24abb5c..961ce4f 100644
--- a/lib/cns11643_1.h
+++ b/lib/cns11643_1.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_15.h b/lib/cns11643_15.h
index cfe0ba6..ce022b6 100644
--- a/lib/cns11643_15.h
+++ b/lib/cns11643_15.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_2.h b/lib/cns11643_2.h
index 7a73c60..2c48a91 100644
--- a/lib/cns11643_2.h
+++ b/lib/cns11643_2.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_3.h b/lib/cns11643_3.h
index e263013..3bf5a0d 100644
--- a/lib/cns11643_3.h
+++ b/lib/cns11643_3.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_4.h b/lib/cns11643_4.h
index e725992..ae2126f 100644
--- a/lib/cns11643_4.h
+++ b/lib/cns11643_4.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_4a.h b/lib/cns11643_4a.h
index ee81576..445dc5e 100644
--- a/lib/cns11643_4a.h
+++ b/lib/cns11643_4a.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_4b.h b/lib/cns11643_4b.h
index 6a9823e..a78601a 100644
--- a/lib/cns11643_4b.h
+++ b/lib/cns11643_4b.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_5.h b/lib/cns11643_5.h
index f0e5ebe..24d9ded 100644
--- a/lib/cns11643_5.h
+++ b/lib/cns11643_5.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_6.h b/lib/cns11643_6.h
index 8493984..9ca441d 100644
--- a/lib/cns11643_6.h
+++ b/lib/cns11643_6.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_7.h b/lib/cns11643_7.h
index 44532bc..3937a76 100644
--- a/lib/cns11643_7.h
+++ b/lib/cns11643_7.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cns11643_inv.h b/lib/cns11643_inv.h
index 2b8860e..97d36d6 100644
--- a/lib/cns11643_inv.h
+++ b/lib/cns11643_inv.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/config.h.in b/lib/config.h.in
index d4e116b..89abce2 100644
--- a/lib/config.h.in
+++ b/lib/config.h.in
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /* Define to 1 to enable a few rarely used encodings. */
diff --git a/lib/converters.h b/lib/converters.h
index 1b93dbe..fdd1830 100644
--- a/lib/converters.h
+++ b/lib/converters.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This file defines all the converters. */
diff --git a/lib/cp1046.h b/lib/cp1046.h
index b6716b7..4514c35 100644
--- a/lib/cp1046.h
+++ b/lib/cp1046.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1124.h b/lib/cp1124.h
index 8b97a7e..d1b2402 100644
--- a/lib/cp1124.h
+++ b/lib/cp1124.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1125.h b/lib/cp1125.h
index 802f074..ff9a0a0 100644
--- a/lib/cp1125.h
+++ b/lib/cp1125.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1129.h b/lib/cp1129.h
index 1b7cff8..f76cd72 100644
--- a/lib/cp1129.h
+++ b/lib/cp1129.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1131.h b/lib/cp1131.h
index 15f4ed2..69074de 100644
--- a/lib/cp1131.h
+++ b/lib/cp1131.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1133.h b/lib/cp1133.h
index a16d93f..b8ac91f 100644
--- a/lib/cp1133.h
+++ b/lib/cp1133.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1161.h b/lib/cp1161.h
index b6349c6..998c597 100644
--- a/lib/cp1161.h
+++ b/lib/cp1161.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1162.h b/lib/cp1162.h
index 6c7fa82..3aa1558 100644
--- a/lib/cp1162.h
+++ b/lib/cp1162.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1163.h b/lib/cp1163.h
index ca5d0b0..0bb767b 100644
--- a/lib/cp1163.h
+++ b/lib/cp1163.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1250.h b/lib/cp1250.h
index b89300f..f3f0224 100644
--- a/lib/cp1250.h
+++ b/lib/cp1250.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1251.h b/lib/cp1251.h
index 0fa540d..46864b2 100644
--- a/lib/cp1251.h
+++ b/lib/cp1251.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1252.h b/lib/cp1252.h
index 1564442..f2b56c9 100644
--- a/lib/cp1252.h
+++ b/lib/cp1252.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1253.h b/lib/cp1253.h
index 020f0d6..fe86bec 100644
--- a/lib/cp1253.h
+++ b/lib/cp1253.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1254.h b/lib/cp1254.h
index 845a01b..117b496 100644
--- a/lib/cp1254.h
+++ b/lib/cp1254.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1255.h b/lib/cp1255.h
index e7761ae..50a9558 100644
--- a/lib/cp1255.h
+++ b/lib/cp1255.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1256.h b/lib/cp1256.h
index 3804e8f..ed9addb 100644
--- a/lib/cp1256.h
+++ b/lib/cp1256.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1257.h b/lib/cp1257.h
index 0d8518e..8ead70f 100644
--- a/lib/cp1257.h
+++ b/lib/cp1257.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp1258.h b/lib/cp1258.h
index 5783404..c95e377 100644
--- a/lib/cp1258.h
+++ b/lib/cp1258.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp437.h b/lib/cp437.h
index a3c8e68..ae8667a 100644
--- a/lib/cp437.h
+++ b/lib/cp437.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp50221_0208_ext.h b/lib/cp50221_0208_ext.h
index bdbc73f..2fb9814 100644
--- a/lib/cp50221_0208_ext.h
+++ b/lib/cp50221_0208_ext.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp50221_0212_ext.h b/lib/cp50221_0212_ext.h
index 1ddc99b..3aca338 100644
--- a/lib/cp50221_0212_ext.h
+++ b/lib/cp50221_0212_ext.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp737.h b/lib/cp737.h
index 955e458..2adeb03 100644
--- a/lib/cp737.h
+++ b/lib/cp737.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp775.h b/lib/cp775.h
index b9a5a5c..d830ae8 100644
--- a/lib/cp775.h
+++ b/lib/cp775.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp850.h b/lib/cp850.h
index 25acfee..7283793 100644
--- a/lib/cp850.h
+++ b/lib/cp850.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp852.h b/lib/cp852.h
index fac7a63..a7a2be2 100644
--- a/lib/cp852.h
+++ b/lib/cp852.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp853.h b/lib/cp853.h
index fe82ae9..ee38eae 100644
--- a/lib/cp853.h
+++ b/lib/cp853.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp855.h b/lib/cp855.h
index ddb8bf1..2d6c923 100644
--- a/lib/cp855.h
+++ b/lib/cp855.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp856.h b/lib/cp856.h
index 30ba80b..bd487e6 100644
--- a/lib/cp856.h
+++ b/lib/cp856.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp857.h b/lib/cp857.h
index 09de722..7cf87ee 100644
--- a/lib/cp857.h
+++ b/lib/cp857.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp858.h b/lib/cp858.h
index dd26d0a..6993df0 100644
--- a/lib/cp858.h
+++ b/lib/cp858.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp860.h b/lib/cp860.h
index 2cca2f1..5620c5a 100644
--- a/lib/cp860.h
+++ b/lib/cp860.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp861.h b/lib/cp861.h
index 07bcf5f..5099a6b 100644
--- a/lib/cp861.h
+++ b/lib/cp861.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp862.h b/lib/cp862.h
index 623fc4d..258aeb2 100644
--- a/lib/cp862.h
+++ b/lib/cp862.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp863.h b/lib/cp863.h
index 5890ad4..3362e3f 100644
--- a/lib/cp863.h
+++ b/lib/cp863.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp864.h b/lib/cp864.h
index a1d8c4a..2a7c9d8 100644
--- a/lib/cp864.h
+++ b/lib/cp864.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp865.h b/lib/cp865.h
index 3944916..3969017 100644
--- a/lib/cp865.h
+++ b/lib/cp865.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp866.h b/lib/cp866.h
index 0aaa216..8e20750 100644
--- a/lib/cp866.h
+++ b/lib/cp866.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp869.h b/lib/cp869.h
index 8e839d2..00f71c9 100644
--- a/lib/cp869.h
+++ b/lib/cp869.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp874.h b/lib/cp874.h
index 6374dd7..dcd6a82 100644
--- a/lib/cp874.h
+++ b/lib/cp874.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp922.h b/lib/cp922.h
index ca661b3..7192236 100644
--- a/lib/cp922.h
+++ b/lib/cp922.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp932.h b/lib/cp932.h
index 6534cd0..5a51a7a 100644
--- a/lib/cp932.h
+++ b/lib/cp932.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp932ext.h b/lib/cp932ext.h
index 66a73eb..4704993 100644
--- a/lib/cp932ext.h
+++ b/lib/cp932ext.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp936.h b/lib/cp936.h
index 06e510c..8c307de 100644
--- a/lib/cp936.h
+++ b/lib/cp936.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp936ext.h b/lib/cp936ext.h
index db1817b..8fce5b3 100644
--- a/lib/cp936ext.h
+++ b/lib/cp936ext.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp943.h b/lib/cp943.h
index dbaebe9..2c65335 100644
--- a/lib/cp943.h
+++ b/lib/cp943.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp949.h b/lib/cp949.h
index 665e724..4182e9f 100644
--- a/lib/cp949.h
+++ b/lib/cp949.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp950.h b/lib/cp950.h
index 28ca199..737f9a9 100644
--- a/lib/cp950.h
+++ b/lib/cp950.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/cp950ext.h b/lib/cp950ext.h
index 93e1563..38efb0b 100644
--- a/lib/cp950ext.h
+++ b/lib/cp950ext.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/dec_hanyu.h b/lib/dec_hanyu.h
index 065fd5d..31fa7e3 100644
--- a/lib/dec_hanyu.h
+++ b/lib/dec_hanyu.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/dec_kanji.h b/lib/dec_kanji.h
index 0a056fb..7d117cd 100644
--- a/lib/dec_kanji.h
+++ b/lib/dec_kanji.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/encodings.def b/lib/encodings.def
index 778555a..0b6486d 100644
--- a/lib/encodings.def
+++ b/lib/encodings.def
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* The list of all system independent user-visible encodings. */
 
diff --git a/lib/encodings_aix.def b/lib/encodings_aix.def
index 259452e..462bfd1 100644
--- a/lib/encodings_aix.def
+++ b/lib/encodings_aix.def
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Encodings used by system dependent locales on AIX. */
 
diff --git a/lib/encodings_dos.def b/lib/encodings_dos.def
index c9d30c8..1965ae2 100644
--- a/lib/encodings_dos.def
+++ b/lib/encodings_dos.def
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Encodings used by system dependent locales on MSDOS. */
 
diff --git a/lib/encodings_extra.def b/lib/encodings_extra.def
index 614422b..257c3c8 100644
--- a/lib/encodings_extra.def
+++ b/lib/encodings_extra.def
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 DEFENCODING(( "EUC-JISX0213",
               "EUC-JIS-2004",           /* x0213.org */
diff --git a/lib/encodings_local.def b/lib/encodings_local.def
index 4e793e5..4ae7931 100644
--- a/lib/encodings_local.def
+++ b/lib/encodings_local.def
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Names for locale dependent encodings. */
 
diff --git a/lib/encodings_osf1.def b/lib/encodings_osf1.def
index 7912854..f28cfe6 100644
--- a/lib/encodings_osf1.def
+++ b/lib/encodings_osf1.def
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Encodings used by system dependent locales on OSF/1 a.k.a. Tru64. */
 
diff --git a/lib/euc_cn.h b/lib/euc_cn.h
index a25417a..e83bbc6 100644
--- a/lib/euc_cn.h
+++ b/lib/euc_cn.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/euc_jisx0213.h b/lib/euc_jisx0213.h
index 4d417ca..b73f10e 100644
--- a/lib/euc_jisx0213.h
+++ b/lib/euc_jisx0213.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/euc_jp.h b/lib/euc_jp.h
index 84fa2e7..1c13734 100644
--- a/lib/euc_jp.h
+++ b/lib/euc_jp.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/euc_kr.h b/lib/euc_kr.h
index 8b3dd05..66ac799 100644
--- a/lib/euc_kr.h
+++ b/lib/euc_kr.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/euc_tw.h b/lib/euc_tw.h
index f7bdc8b..c2542a2 100644
--- a/lib/euc_tw.h
+++ b/lib/euc_tw.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/flushwc.h b/lib/flushwc.h
index da25212..1cddd76 100644
--- a/lib/flushwc.h
+++ b/lib/flushwc.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _FLUSHWC_H
diff --git a/lib/gb12345.h b/lib/gb12345.h
index b7e062e..90a806b 100644
--- a/lib/gb12345.h
+++ b/lib/gb12345.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/gb12345ext.h b/lib/gb12345ext.h
index c73b178..b26634e 100644
--- a/lib/gb12345ext.h
+++ b/lib/gb12345ext.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/gb18030.h b/lib/gb18030.h
index e9502e1..a2301e3 100644
--- a/lib/gb18030.h
+++ b/lib/gb18030.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/gb18030ext.h b/lib/gb18030ext.h
index 5e59419..235c34a 100644
--- a/lib/gb18030ext.h
+++ b/lib/gb18030ext.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/gb18030uni.h b/lib/gb18030uni.h
index bea31e5..ffdf338 100644
--- a/lib/gb18030uni.h
+++ b/lib/gb18030uni.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/gb2312.h b/lib/gb2312.h
index 98ffc55..e13dd84 100644
--- a/lib/gb2312.h
+++ b/lib/gb2312.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/gbk.h b/lib/gbk.h
index b6ff526..6381c28 100644
--- a/lib/gbk.h
+++ b/lib/gbk.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/gbkext1.h b/lib/gbkext1.h
index d244c76..b440e8c 100644
--- a/lib/gbkext1.h
+++ b/lib/gbkext1.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/gbkext2.h b/lib/gbkext2.h
index 5a0dbde..1f0004c 100644
--- a/lib/gbkext2.h
+++ b/lib/gbkext2.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/gbkext_inv.h b/lib/gbkext_inv.h
index 197d6ac..bef9bcb 100644
--- a/lib/gbkext_inv.h
+++ b/lib/gbkext_inv.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/genaliases.c b/lib/genaliases.c
index b54b97d..d37137c 100644
--- a/lib/genaliases.c
+++ b/lib/genaliases.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Creates the aliases.gperf table. */
 
diff --git a/lib/genaliases2.c b/lib/genaliases2.c
index 1b789ed..5304771 100644
--- a/lib/genaliases2.c
+++ b/lib/genaliases2.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Creates the aliases2.h table. */
 
diff --git a/lib/genflags.c b/lib/genflags.c
index 448f892..f2d7d70 100644
--- a/lib/genflags.c
+++ b/lib/genflags.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Creates the flags.h include file. */
 
diff --git a/lib/gentranslit.c b/lib/gentranslit.c
index 0b2779c..7853575 100644
--- a/lib/gentranslit.c
+++ b/lib/gentranslit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2003, 2005, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2003, 2005, 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU LIBICONV Library.
 
    The GNU LIBICONV Library is free software; you can redistribute it
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /*
  * Generates a table of small strings, used for transliteration, from a table
@@ -51,8 +50,7 @@
   printf(" *\n");
   printf(" * You should have received a copy of the GNU Library General Public\n");
   printf(" * License along with the GNU LIBICONV Library; see the file COPYING.LIB.\n");
-  printf(" * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,\n");
-  printf(" * Fifth Floor, Boston, MA 02110-1301, USA.\n");
+  printf(" * If not, see <http://www.gnu.org/licenses/>.\n");
   printf(" */\n");
   printf("\n");
   printf("/*\n");
diff --git a/lib/georgian_academy.h b/lib/georgian_academy.h
index ddbe578..145c928 100644
--- a/lib/georgian_academy.h
+++ b/lib/georgian_academy.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/georgian_ps.h b/lib/georgian_ps.h
index e23dbae..4c13f62 100644
--- a/lib/georgian_ps.h
+++ b/lib/georgian_ps.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/hkscs1999.h b/lib/hkscs1999.h
index 049af97..c7605d3 100644
--- a/lib/hkscs1999.h
+++ b/lib/hkscs1999.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/hkscs2001.h b/lib/hkscs2001.h
index b69342c..06dd8af 100644
--- a/lib/hkscs2001.h
+++ b/lib/hkscs2001.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/hkscs2004.h b/lib/hkscs2004.h
index bfa2aad..f20b462 100644
--- a/lib/hkscs2004.h
+++ b/lib/hkscs2004.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/hkscs2008.h b/lib/hkscs2008.h
index 3e15bcd..191184d 100644
--- a/lib/hkscs2008.h
+++ b/lib/hkscs2008.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/hp_roman8.h b/lib/hp_roman8.h
index da776ed..753991b 100644
--- a/lib/hp_roman8.h
+++ b/lib/hp_roman8.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/hz.h b/lib/hz.h
index db0b4b1..fac48bb 100644
--- a/lib/hz.h
+++ b/lib/hz.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iconv.c b/lib/iconv.c
index 3785296..93dc42f 100644
--- a/lib/iconv.c
+++ b/lib/iconv.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <iconv.h>
diff --git a/lib/iconv_open1.h b/lib/iconv_open1.h
index acee5a4..0b1ff36 100644
--- a/lib/iconv_open1.h
+++ b/lib/iconv_open1.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Part 1 of iconv_open.
diff --git a/lib/iconv_open2.h b/lib/iconv_open2.h
index 6d6296f..7295ee8 100644
--- a/lib/iconv_open2.h
+++ b/lib/iconv_open2.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Part 2 of iconv_open.
diff --git a/lib/iso2022_cn.h b/lib/iso2022_cn.h
index d7e3e39..9b2b3e3 100644
--- a/lib/iso2022_cn.h
+++ b/lib/iso2022_cn.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso2022_cnext.h b/lib/iso2022_cnext.h
index f848870..9d8144a 100644
--- a/lib/iso2022_cnext.h
+++ b/lib/iso2022_cnext.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso2022_jp.h b/lib/iso2022_jp.h
index 1c8abec..6e5b3f1 100644
--- a/lib/iso2022_jp.h
+++ b/lib/iso2022_jp.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso2022_jp1.h b/lib/iso2022_jp1.h
index c309474..7b99ea8 100644
--- a/lib/iso2022_jp1.h
+++ b/lib/iso2022_jp1.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso2022_jp2.h b/lib/iso2022_jp2.h
index 5e3ca41..d1e70c8 100644
--- a/lib/iso2022_jp2.h
+++ b/lib/iso2022_jp2.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso2022_jp3.h b/lib/iso2022_jp3.h
index 58cea1b..817fe55 100644
--- a/lib/iso2022_jp3.h
+++ b/lib/iso2022_jp3.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso2022_jpms.h b/lib/iso2022_jpms.h
index 1d4a3fc..6f91f1c 100644
--- a/lib/iso2022_jpms.h
+++ b/lib/iso2022_jpms.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso2022_kr.h b/lib/iso2022_kr.h
index 8045d4e..df6df74 100644
--- a/lib/iso2022_kr.h
+++ b/lib/iso2022_kr.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso646_cn.h b/lib/iso646_cn.h
index a571ce7..4bec7bc 100644
--- a/lib/iso646_cn.h
+++ b/lib/iso646_cn.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso646_jp.h b/lib/iso646_jp.h
index 7cc3abd..631f5fe 100644
--- a/lib/iso646_jp.h
+++ b/lib/iso646_jp.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_1.h b/lib/iso8859_1.h
index 5346916..05e542b 100644
--- a/lib/iso8859_1.h
+++ b/lib/iso8859_1.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_10.h b/lib/iso8859_10.h
index 49b3f6a..1a09d7b 100644
--- a/lib/iso8859_10.h
+++ b/lib/iso8859_10.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_11.h b/lib/iso8859_11.h
index ef8b1a6..c6636ab 100644
--- a/lib/iso8859_11.h
+++ b/lib/iso8859_11.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_13.h b/lib/iso8859_13.h
index 2fadc7b..0b6d789 100644
--- a/lib/iso8859_13.h
+++ b/lib/iso8859_13.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_14.h b/lib/iso8859_14.h
index 01c9cdd..3a33d28 100644
--- a/lib/iso8859_14.h
+++ b/lib/iso8859_14.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_15.h b/lib/iso8859_15.h
index 24de90d..19d7261 100644
--- a/lib/iso8859_15.h
+++ b/lib/iso8859_15.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_16.h b/lib/iso8859_16.h
index 2004718..1e199e1 100644
--- a/lib/iso8859_16.h
+++ b/lib/iso8859_16.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_2.h b/lib/iso8859_2.h
index 9ad4d4a..680747c 100644
--- a/lib/iso8859_2.h
+++ b/lib/iso8859_2.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_3.h b/lib/iso8859_3.h
index 308e0b0..fc00539 100644
--- a/lib/iso8859_3.h
+++ b/lib/iso8859_3.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_4.h b/lib/iso8859_4.h
index 51e1778..0b0e104 100644
--- a/lib/iso8859_4.h
+++ b/lib/iso8859_4.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_5.h b/lib/iso8859_5.h
index 6b83605..6967e1e 100644
--- a/lib/iso8859_5.h
+++ b/lib/iso8859_5.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_6.h b/lib/iso8859_6.h
index 8d31199..6a04e2e 100644
--- a/lib/iso8859_6.h
+++ b/lib/iso8859_6.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_7.h b/lib/iso8859_7.h
index 0825ef5..6643f89 100644
--- a/lib/iso8859_7.h
+++ b/lib/iso8859_7.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_8.h b/lib/iso8859_8.h
index 6184846..a696cf8 100644
--- a/lib/iso8859_8.h
+++ b/lib/iso8859_8.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/iso8859_9.h b/lib/iso8859_9.h
index 7dbd37d..8fc5d10 100644
--- a/lib/iso8859_9.h
+++ b/lib/iso8859_9.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/isoir165.h b/lib/isoir165.h
index 4d6e9ff..e3fde19 100644
--- a/lib/isoir165.h
+++ b/lib/isoir165.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/isoir165ext.h b/lib/isoir165ext.h
index a124941..7e4188a 100644
--- a/lib/isoir165ext.h
+++ b/lib/isoir165ext.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/java.h b/lib/java.h
index 4d4485f..035b4a1 100644
--- a/lib/java.h
+++ b/lib/java.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/jisx0201.h b/lib/jisx0201.h
index d58c1d5..12df1db 100644
--- a/lib/jisx0201.h
+++ b/lib/jisx0201.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/jisx0208.h b/lib/jisx0208.h
index af303a6..adcef3b 100644
--- a/lib/jisx0208.h
+++ b/lib/jisx0208.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/jisx0212.h b/lib/jisx0212.h
index d0fc372..c04650e 100644
--- a/lib/jisx0212.h
+++ b/lib/jisx0212.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/jisx0213.h b/lib/jisx0213.h
index ff32c6d..6f6d3d2 100644
--- a/lib/jisx0213.h
+++ b/lib/jisx0213.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/johab.h b/lib/johab.h
index fb2c17f..d2fcda2 100644
--- a/lib/johab.h
+++ b/lib/johab.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/johab_hangul.h b/lib/johab_hangul.h
index 68368df..84f2697 100644
--- a/lib/johab_hangul.h
+++ b/lib/johab_hangul.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/koi8_r.h b/lib/koi8_r.h
index 3e43536..7c7f9f7 100644
--- a/lib/koi8_r.h
+++ b/lib/koi8_r.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/koi8_ru.h b/lib/koi8_ru.h
index e43ae72..71f1603 100644
--- a/lib/koi8_ru.h
+++ b/lib/koi8_ru.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/koi8_t.h b/lib/koi8_t.h
index 0f7a568..5c8f2be 100644
--- a/lib/koi8_t.h
+++ b/lib/koi8_t.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/koi8_u.h b/lib/koi8_u.h
index 0637d58..7553e55 100644
--- a/lib/koi8_u.h
+++ b/lib/koi8_u.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ksc5601.h b/lib/ksc5601.h
index 60b8c9a..042a85a 100644
--- a/lib/ksc5601.h
+++ b/lib/ksc5601.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/loop_unicode.h b/lib/loop_unicode.h
index 1c787b5..e857fa8 100644
--- a/lib/loop_unicode.h
+++ b/lib/loop_unicode.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This file defines the conversion loop via Unicode as a pivot encoding. */
diff --git a/lib/loop_wchar.h b/lib/loop_wchar.h
index 6dc011b..6760079 100644
--- a/lib/loop_wchar.h
+++ b/lib/loop_wchar.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This file defines three conversion loops:
diff --git a/lib/loops.h b/lib/loops.h
index 782cc09..ab5d4fa 100644
--- a/lib/loops.h
+++ b/lib/loops.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This file defines all the loops. */
diff --git a/lib/mac_arabic.h b/lib/mac_arabic.h
index 9d05a1a..6b54280 100644
--- a/lib/mac_arabic.h
+++ b/lib/mac_arabic.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_centraleurope.h b/lib/mac_centraleurope.h
index be030cf..fdc9f6e 100644
--- a/lib/mac_centraleurope.h
+++ b/lib/mac_centraleurope.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_croatian.h b/lib/mac_croatian.h
index 582f3e0..b26f4bd 100644
--- a/lib/mac_croatian.h
+++ b/lib/mac_croatian.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_cyrillic.h b/lib/mac_cyrillic.h
index a5b5972..691d571 100644
--- a/lib/mac_cyrillic.h
+++ b/lib/mac_cyrillic.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_greek.h b/lib/mac_greek.h
index 3cc4ac2..f045869 100644
--- a/lib/mac_greek.h
+++ b/lib/mac_greek.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_hebrew.h b/lib/mac_hebrew.h
index c7f97bb..71a5813 100644
--- a/lib/mac_hebrew.h
+++ b/lib/mac_hebrew.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_iceland.h b/lib/mac_iceland.h
index b49f164..7e284d0 100644
--- a/lib/mac_iceland.h
+++ b/lib/mac_iceland.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_roman.h b/lib/mac_roman.h
index 7a6d51a..f64f086 100644
--- a/lib/mac_roman.h
+++ b/lib/mac_roman.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_romania.h b/lib/mac_romania.h
index 2d35562..9d87d3d 100644
--- a/lib/mac_romania.h
+++ b/lib/mac_romania.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_thai.h b/lib/mac_thai.h
index 74d15aa..5ba2441 100644
--- a/lib/mac_thai.h
+++ b/lib/mac_thai.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_turkish.h b/lib/mac_turkish.h
index 94f7d37..cf25896 100644
--- a/lib/mac_turkish.h
+++ b/lib/mac_turkish.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mac_ukraine.h b/lib/mac_ukraine.h
index 8ea17b0..b2714cd 100644
--- a/lib/mac_ukraine.h
+++ b/lib/mac_ukraine.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/mulelao.h b/lib/mulelao.h
index abfb5cf..38ab466 100644
--- a/lib/mulelao.h
+++ b/lib/mulelao.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/nextstep.h b/lib/nextstep.h
index ffe41b9..5838b81 100644
--- a/lib/nextstep.h
+++ b/lib/nextstep.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/pt154.h b/lib/pt154.h
index 36a5d84..ddbe381 100644
--- a/lib/pt154.h
+++ b/lib/pt154.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/relocatable.c b/lib/relocatable.c
index ad11a91..1b48ab2 100644
--- a/lib/relocatable.c
+++ b/lib/relocatable.c
@@ -12,10 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
-   You should have received a copy of the GNU Library 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.  */
+   You should have received a copy of the GNU Library General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 
 /* Tell glibc's <stdio.h> to provide a prototype for getline().
diff --git a/lib/relocatable.h b/lib/relocatable.h
index 68fe83e..d83fe37 100644
--- a/lib/relocatable.h
+++ b/lib/relocatable.h
@@ -12,10 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
-   You should have received a copy of the GNU Library 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.  */
+   You should have received a copy of the GNU Library General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _RELOCATABLE_H
 #define _RELOCATABLE_H
diff --git a/lib/riscos1.h b/lib/riscos1.h
index 2ebc751..2620637 100644
--- a/lib/riscos1.h
+++ b/lib/riscos1.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/rk1048.h b/lib/rk1048.h
index 0e1fde8..4b88f64 100644
--- a/lib/rk1048.h
+++ b/lib/rk1048.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/shift_jisx0213.h b/lib/shift_jisx0213.h
index 05f00b0..68805f0 100644
--- a/lib/shift_jisx0213.h
+++ b/lib/shift_jisx0213.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/sjis.h b/lib/sjis.h
index 8244e3a..c12b259 100644
--- a/lib/sjis.h
+++ b/lib/sjis.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/tcvn.h b/lib/tcvn.h
index abd5def..96090df 100644
--- a/lib/tcvn.h
+++ b/lib/tcvn.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/tds565.h b/lib/tds565.h
index 479513f..440e8a7 100644
--- a/lib/tds565.h
+++ b/lib/tds565.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/tis620.h b/lib/tis620.h
index 125e6dc..6938e4d 100644
--- a/lib/tis620.h
+++ b/lib/tis620.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/translit.def b/lib/translit.def
index cbd329e..f7d78d4 100644
--- a/lib/translit.def
+++ b/lib/translit.def
@@ -13,8 +13,7 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-# If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301, USA.
+# If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # Definition of transliteration from Unicode to poorer character sets.
diff --git a/lib/translit.h b/lib/translit.h
index 15aa447..54f349f 100644
--- a/lib/translit.h
+++ b/lib/translit.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ucs2.h b/lib/ucs2.h
index 02c946f..5cbe7ed 100644
--- a/lib/ucs2.h
+++ b/lib/ucs2.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ucs2be.h b/lib/ucs2be.h
index 150c0a3..7d7a129 100644
--- a/lib/ucs2be.h
+++ b/lib/ucs2be.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ucs2internal.h b/lib/ucs2internal.h
index d482aea..5e65a70 100644
--- a/lib/ucs2internal.h
+++ b/lib/ucs2internal.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ucs2le.h b/lib/ucs2le.h
index 4901861..387db7f 100644
--- a/lib/ucs2le.h
+++ b/lib/ucs2le.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ucs2swapped.h b/lib/ucs2swapped.h
index f426f40..c2a5cb1 100644
--- a/lib/ucs2swapped.h
+++ b/lib/ucs2swapped.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ucs4.h b/lib/ucs4.h
index ef9da5f..6b5b6d9 100644
--- a/lib/ucs4.h
+++ b/lib/ucs4.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ucs4be.h b/lib/ucs4be.h
index 241bc15..e2a0c24 100644
--- a/lib/ucs4be.h
+++ b/lib/ucs4be.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ucs4internal.h b/lib/ucs4internal.h
index bd793a3..be74b1d 100644
--- a/lib/ucs4internal.h
+++ b/lib/ucs4internal.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ucs4le.h b/lib/ucs4le.h
index 0c762fe..66e11a2 100644
--- a/lib/ucs4le.h
+++ b/lib/ucs4le.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/ucs4swapped.h b/lib/ucs4swapped.h
index 6a292ec..a6aa359 100644
--- a/lib/ucs4swapped.h
+++ b/lib/ucs4swapped.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/uhc_1.h b/lib/uhc_1.h
index 9c83f6f..5879669 100644
--- a/lib/uhc_1.h
+++ b/lib/uhc_1.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/uhc_2.h b/lib/uhc_2.h
index b210c26..1cb80a2 100644
--- a/lib/uhc_2.h
+++ b/lib/uhc_2.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/utf16.h b/lib/utf16.h
index 99b5e2c..8e8957a 100644
--- a/lib/utf16.h
+++ b/lib/utf16.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/utf16be.h b/lib/utf16be.h
index a6d90ff..5d93ca2 100644
--- a/lib/utf16be.h
+++ b/lib/utf16be.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/utf16le.h b/lib/utf16le.h
index 5bb2b02..b080643 100644
--- a/lib/utf16le.h
+++ b/lib/utf16le.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/utf32.h b/lib/utf32.h
index 91ab840..10beea5 100644
--- a/lib/utf32.h
+++ b/lib/utf32.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/utf32be.h b/lib/utf32be.h
index 5081129..7c82e80 100644
--- a/lib/utf32be.h
+++ b/lib/utf32be.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/utf32le.h b/lib/utf32le.h
index 9d3699b..926fc5a 100644
--- a/lib/utf32le.h
+++ b/lib/utf32le.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/utf7.h b/lib/utf7.h
index 888bfb4..2ff2743 100644
--- a/lib/utf7.h
+++ b/lib/utf7.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/utf8.h b/lib/utf8.h
index 9d07219..10ddce4 100644
--- a/lib/utf8.h
+++ b/lib/utf8.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/vietcomb.h b/lib/vietcomb.h
index 023b5e3..2b6eceb 100644
--- a/lib/vietcomb.h
+++ b/lib/vietcomb.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Combining characters used in Vietnamese encodings CP1258, TCVN. */
diff --git a/lib/viscii.h b/lib/viscii.h
index 04e68fa..dd660d9 100644
--- a/lib/viscii.h
+++ b/lib/viscii.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/libcharset/configure.ac b/libcharset/configure.ac
index 8c29191..9a42a85 100644
--- a/libcharset/configure.ac
+++ b/libcharset/configure.ac
@@ -13,8 +13,7 @@
 dnl
 dnl You should have received a copy of the GNU Library General Public License
 dnl along with the GNU CHARSET Library; see the file COPYING.LIB.  If not,
-dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Fifth Floor, Boston, MA 02110-1301, USA.
+dnl see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.13])
 
diff --git a/libcharset/include/libcharset.h.in b/libcharset/include/libcharset.h.in
index 61b0928..79f5a06 100644
--- a/libcharset/include/libcharset.h.in
+++ b/libcharset/include/libcharset.h.in
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public License
    along with the GNU CHARSET Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBCHARSET_H
 #define _LIBCHARSET_H
diff --git a/libcharset/include/localcharset.h.in b/libcharset/include/localcharset.h.in
index 129e4a4..a2adc35 100644
--- a/libcharset/include/localcharset.h.in
+++ b/libcharset/include/localcharset.h.in
@@ -12,10 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
-   You should have received a copy of the GNU Library 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.  */
+   You should have received a copy of the GNU Library General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LOCALCHARSET_H
 #define _LOCALCHARSET_H
diff --git a/libcharset/lib/config.charset b/libcharset/lib/config.charset
index 599e22c..fae71f3 100644
--- a/libcharset/lib/config.charset
+++ b/libcharset/lib/config.charset
@@ -13,10 +13,8 @@
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #   Library General Public License for more details.
 #
-#   You should have received a copy of the GNU Library 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.
+#   You should have received a copy of the GNU Library General Public License
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # The table consists of lines of the form
 #    ALIAS  CANONICAL
diff --git a/libcharset/lib/localcharset.c b/libcharset/lib/localcharset.c
index 6da30dc..1756d5d 100644
--- a/libcharset/lib/localcharset.c
+++ b/libcharset/lib/localcharset.c
@@ -12,10 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
-   You should have received a copy of the GNU Library 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.  */
+   You should have received a copy of the GNU Library General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
diff --git a/libcharset/lib/ref-add.sin b/libcharset/lib/ref-add.sin
index 0e2b97b..184b60e 100644
--- a/libcharset/lib/ref-add.sin
+++ b/libcharset/lib/ref-add.sin
@@ -12,10 +12,8 @@
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #   Library General Public License for more details.
 #
-#   You should have received a copy of the GNU Library 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.
+#   You should have received a copy of the GNU Library General Public License
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # Written by Bruno Haible <bruno@clisp.org>.
 #
diff --git a/libcharset/lib/ref-del.sin b/libcharset/lib/ref-del.sin
index 1fafbfc..3bbcbcc 100644
--- a/libcharset/lib/ref-del.sin
+++ b/libcharset/lib/ref-del.sin
@@ -12,10 +12,8 @@
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #   Library General Public License for more details.
 #
-#   You should have received a copy of the GNU Library 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.
+#   You should have received a copy of the GNU Library General Public License
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # Written by Bruno Haible <bruno@clisp.org>.
 #
diff --git a/libcharset/lib/relocatable.c b/libcharset/lib/relocatable.c
index ad11a91..1b48ab2 100644
--- a/libcharset/lib/relocatable.c
+++ b/libcharset/lib/relocatable.c
@@ -12,10 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
-   You should have received a copy of the GNU Library 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.  */
+   You should have received a copy of the GNU Library General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 
 /* Tell glibc's <stdio.h> to provide a prototype for getline().
diff --git a/libcharset/lib/relocatable.h b/libcharset/lib/relocatable.h
index 68fe83e..d83fe37 100644
--- a/libcharset/lib/relocatable.h
+++ b/libcharset/lib/relocatable.h
@@ -12,10 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
-   You should have received a copy of the GNU Library 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.  */
+   You should have received a copy of the GNU Library General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _RELOCATABLE_H
 #define _RELOCATABLE_H
diff --git a/preload/configure.ac b/preload/configure.ac
index a42cabb..70b729c 100644
--- a/preload/configure.ac
+++ b/preload/configure.ac
@@ -13,8 +13,7 @@
 dnl
 dnl You should have received a copy of the GNU Library General Public License
 dnl along with the GNU LIBICONV Library; see the file COPYING.LIB.  If not,
-dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Fifth Floor, Boston, MA 02110-1301, USA.
+dnl see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.60])
 
diff --git a/srclib/Makefile.am b/srclib/Makefile.am
index 2384359..23bbe1d 100644
--- a/srclib/Makefile.am
+++ b/srclib/Makefile.am
@@ -12,9 +12,7 @@
 ## GNU General Public License for more details.
 ##
 ## 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.
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in.
 
diff --git a/tests/gengb18030z.c b/tests/gengb18030z.c
index 5c0aa75..96b6beb 100644
--- a/tests/gengb18030z.c
+++ b/tests/gengb18030z.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Creates the beyond-BMP part of the GB18030.TXT reference table. */
 
diff --git a/tests/genutf8.c b/tests/genutf8.c
index 52a6b68..85086fb 100644
--- a/tests/genutf8.c
+++ b/tests/genutf8.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Creates the UTF-8.TXT reference table. */
 
diff --git a/tests/table-from.c b/tests/table-from.c
index 03bf0d9..1caff37 100644
--- a/tests/table-from.c
+++ b/tests/table-from.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Create a table from CHARSET to Unicode. */
 
diff --git a/tests/table-to.c b/tests/table-to.c
index 150d82a..6925f9e 100644
--- a/tests/table-to.c
+++ b/tests/table-to.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Create a table from Unicode to CHARSET. */
 
diff --git a/tests/test-shiftseq.c b/tests/test-shiftseq.c
index acf5564..261edad 100644
--- a/tests/test-shiftseq.c
+++ b/tests/test-shiftseq.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
 
diff --git a/tests/test-to-wchar.c b/tests/test-to-wchar.c
index 56bf222..952ac5b 100644
--- a/tests/test-to-wchar.c
+++ b/tests/test-to-wchar.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU LIBICONV Library; see the file COPYING.LIB.
-   If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
 
diff --git a/tools/8bit_tab_to_h.c b/tools/8bit_tab_to_h.c
index c7b7c16..ba5d230 100644
--- a/tools/8bit_tab_to_h.c
+++ b/tools/8bit_tab_to_h.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2002, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2002, 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU LIBICONV Tools.
 
    This program is free software: you can redistribute it and/or modify
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    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., along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 /*
  * Generates an 8-bit character set table from a .TXT table as found on
@@ -162,8 +161,7 @@
     fprintf(f, " *\n");
     fprintf(f, " * You should have received a copy of the GNU Library General Public\n");
     fprintf(f, " * License along with the GNU LIBICONV Library; see the file COPYING.LIB.\n");
-    fprintf(f, " * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,\n");
-    fprintf(f, " * Fifth Floor, Boston, MA 02110-1301, USA.\n");
+    fprintf(f, " * If not, see <http://www.gnu.org/licenses/>.\n");
     fprintf(f, " */\n");
     fprintf(f, "\n");
     fprintf(f, "/*\n");
diff --git a/tools/cjk_tab_to_h.c b/tools/cjk_tab_to_h.c
index c6c4d94..d73c9a1 100644
--- a/tools/cjk_tab_to_h.c
+++ b/tools/cjk_tab_to_h.c
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    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., along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 /*
  * Generates a CJK character set table from a .TXT table as found on
@@ -91,8 +90,7 @@
   printf(" *\n");
   printf(" * You should have received a copy of the GNU Library General Public\n");
   printf(" * License along with the GNU LIBICONV Library; see the file COPYING.LIB.\n");
-  printf(" * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,\n");
-  printf(" * Fifth Floor, Boston, MA 02110-1301, USA.\n");
+  printf(" * If not, see <http://www.gnu.org/licenses/>.\n");
   printf(" */\n");
   printf("\n");
   printf("/*\n");
diff --git a/tools/cjk_variants.c b/tools/cjk_variants.c
index fa26276..baacc7f 100644
--- a/tools/cjk_variants.c
+++ b/tools/cjk_variants.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2002, 2012 Free Software Foundation, Inc.
    This file is part of the GNU LIBICONV Tools.
 
    This program is free software: you can redistribute it and/or modify
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    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., along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 /*
  * Generates Unicode variants table from Koichi Yasuoka's UniVariants file.
@@ -50,8 +49,7 @@
   printf(" *\n");
   printf(" * You should have received a copy of the GNU Library General Public\n");
   printf(" * License along with the GNU LIBICONV Library; see the file COPYING.LIB.\n");
-  printf(" * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,\n");
-  printf(" * Fifth Floor, Boston, MA 02110-1301, USA.\n");
+  printf(" * If not, see <http://www.gnu.org/licenses/>.\n");
   printf(" */\n");
   printf("\n");
   printf("/*\n");
diff --git a/windows/libiconv.rc b/windows/libiconv.rc
index aa72b9c..60ce5e4 100644
--- a/windows/libiconv.rc
+++ b/windows/libiconv.rc
@@ -19,7 +19,7 @@
     BEGIN
         BLOCK "04090000"  /* Lang = US English, Charset = ASCII */
         BEGIN
-            VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\0"
+            VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License. You should have received a copy of the GNU Library General Public License along with this library; if not, see <http://www.gnu.org/licenses/>.\0"
             VALUE "CompanyName", "Free Software Foundation\0"
             VALUE "FileDescription", "LGPLed libiconv for Windows NT/2000/XP/Vista/7 and Windows 95/98/ME\0"
             VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"