33 files changed, 63 insertions, 63 deletions

diff --git a/src/main/extract.c b/src/main/extract.c
index 80e8c0a..fd7cc96 100644
--- a/src/main/extract.c
+++ b/src/main/extract.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file main/extract.c
diff --git a/src/main/extractor.c b/src/main/extractor.c
index edde5cf..81345d3 100644
--- a/src/main/extractor.c
+++ b/src/main/extractor.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 
 #include "platform.h"
diff --git a/src/main/extractor_common.c b/src/main/extractor_common.c
index c251abd..866609e 100644
--- a/src/main/extractor_common.c
+++ b/src/main/extractor_common.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_common.c
diff --git a/src/main/extractor_common.h b/src/main/extractor_common.h
index 9657e44..14b1c7f 100644
--- a/src/main/extractor_common.h
+++ b/src/main/extractor_common.h
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_common.h
diff --git a/src/main/extractor_datasource.c b/src/main/extractor_datasource.c
index 173f966..ad45ed9 100644
--- a/src/main/extractor_datasource.c
+++ b/src/main/extractor_datasource.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_datasource.c
diff --git a/src/main/extractor_datasource.h b/src/main/extractor_datasource.h
index babcee7..f25cc4b 100644
--- a/src/main/extractor_datasource.h
+++ b/src/main/extractor_datasource.h
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_datasource.h
diff --git a/src/main/extractor_ipc.c b/src/main/extractor_ipc.c
index f52bdcb..47d9d4d 100644
--- a/src/main/extractor_ipc.c
+++ b/src/main/extractor_ipc.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_ipc.c
diff --git a/src/main/extractor_ipc.h b/src/main/extractor_ipc.h
index 3d68a8d..0109b66 100644
--- a/src/main/extractor_ipc.h
+++ b/src/main/extractor_ipc.h
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_ipc.h
diff --git a/src/main/extractor_ipc_gnu.c b/src/main/extractor_ipc_gnu.c
index d73befd..ec02f94 100644
--- a/src/main/extractor_ipc_gnu.c
+++ b/src/main/extractor_ipc_gnu.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_ipc_gnu.c
diff --git a/src/main/extractor_ipc_w32.c b/src/main/extractor_ipc_w32.c
index c6e9afb..c4fbf1b 100644
--- a/src/main/extractor_ipc_w32.c
+++ b/src/main/extractor_ipc_w32.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 
 #include "platform.h"
diff --git a/src/main/extractor_logging.c b/src/main/extractor_logging.c
index daf1925..b1518ae 100644
--- a/src/main/extractor_logging.c
+++ b/src/main/extractor_logging.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_logging.c
diff --git a/src/main/extractor_logging.h b/src/main/extractor_logging.h
index 9f81615..5db9ae1 100644
--- a/src/main/extractor_logging.h
+++ b/src/main/extractor_logging.h
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_logging.h
diff --git a/src/main/extractor_metatypes.c b/src/main/extractor_metatypes.c
index f3e3d66..ac159d1 100644
--- a/src/main/extractor_metatypes.c
+++ b/src/main/extractor_metatypes.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 
 #include "platform.h"
diff --git a/src/main/extractor_plugin_main.c b/src/main/extractor_plugin_main.c
index 3164864..3d20f9c 100644
--- a/src/main/extractor_plugin_main.c
+++ b/src/main/extractor_plugin_main.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_plugin_main.c
diff --git a/src/main/extractor_plugin_main.h b/src/main/extractor_plugin_main.h
index dd3980a..1b33c8c 100644
--- a/src/main/extractor_plugin_main.h
+++ b/src/main/extractor_plugin_main.h
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_plugin_main.c
diff --git a/src/main/extractor_plugins.c b/src/main/extractor_plugins.c
index fa2972f..24bb064 100644
--- a/src/main/extractor_plugins.c
+++ b/src/main/extractor_plugins.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_plugins.c
diff --git a/src/main/extractor_plugins.h b/src/main/extractor_plugins.h
index 84f41ae..958ad94 100644
--- a/src/main/extractor_plugins.h
+++ b/src/main/extractor_plugins.h
@@ -14,8 +14,8 @@
 

      You should have received a copy of the GNU General Public License

      along with libextractor; see the file COPYING.  If not, write to the

-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-     Boston, MA 02111-1307, USA.

+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+     Boston, MA 02110-1301, USA.

  */

 /**

  * @file main/extractor_plugins.h

diff --git a/src/main/extractor_plugpath.c b/src/main/extractor_plugpath.c
index b0a830e..436bbde 100644
--- a/src/main/extractor_plugpath.c
+++ b/src/main/extractor_plugpath.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_plugpath.c
diff --git a/src/main/extractor_plugpath.h b/src/main/extractor_plugpath.h
index 160500e..848be52 100644
--- a/src/main/extractor_plugpath.h
+++ b/src/main/extractor_plugpath.h
@@ -14,8 +14,8 @@
 

      You should have received a copy of the GNU General Public License

      along with libextractor; see the file COPYING.  If not, write to the

-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-     Boston, MA 02111-1307, USA.

+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+     Boston, MA 02110-1301, USA.

  */

 /**

  * @file main/extractor_plugpath.h

diff --git a/src/main/extractor_print.c b/src/main/extractor_print.c
index 69d5ec0..3530430 100644
--- a/src/main/extractor_print.c
+++ b/src/main/extractor_print.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/extractor_print.c
diff --git a/src/main/getopt.c b/src/main/getopt.c
index 0a76868..b64fdf5 100644
--- a/src/main/getopt.c
+++ b/src/main/getopt.c
@@ -21,7 +21,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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
diff --git a/src/main/getopt.h b/src/main/getopt.h
index 0fbb793..d50c90e 100644
--- a/src/main/getopt.h
+++ b/src/main/getopt.h
@@ -16,7 +16,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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 USA.  */
 
 #ifndef _GETOPT_H
diff --git a/src/main/getopt1.c b/src/main/getopt1.c
index 0a95287..6409986 100644
--- a/src/main/getopt1.c
+++ b/src/main/getopt1.c
@@ -16,7 +16,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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 USA.  */
 #include "config.h"
 #include "getopt.h"
diff --git a/src/main/iconv.c b/src/main/iconv.c
index 7a28928..3f95d44 100644
--- a/src/main/iconv.c
+++ b/src/main/iconv.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
diff --git a/src/main/test2_extractor.c b/src/main/test2_extractor.c
index bf4ff50..4d55dc3 100644
--- a/src/main/test2_extractor.c
+++ b/src/main/test2_extractor.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/test2_extractor.c
diff --git a/src/main/test_bzip2.c b/src/main/test_bzip2.c
index 73267cc..37c9aed 100644
--- a/src/main/test_bzip2.c
+++ b/src/main/test_bzip2.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file main/test_bzip2.c
diff --git a/src/main/test_extractor.c b/src/main/test_extractor.c
index 7fedd5b..52b1a59 100644
--- a/src/main/test_extractor.c
+++ b/src/main/test_extractor.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
  */
 /**
  * @file main/test_extractor.c
diff --git a/src/main/test_file.c b/src/main/test_file.c
index 66c9eac..52803c9 100644
--- a/src/main/test_file.c
+++ b/src/main/test_file.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file main/test_file.c
diff --git a/src/main/test_gzip.c b/src/main/test_gzip.c
index fb06e6c..87a61cb 100644
--- a/src/main/test_gzip.c
+++ b/src/main/test_gzip.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file main/test_gzip.c
diff --git a/src/main/test_ipc.c b/src/main/test_ipc.c
index bb4c4a9..5e118fd 100644
--- a/src/main/test_ipc.c
+++ b/src/main/test_ipc.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file main/test_ipc.c
diff --git a/src/main/test_plugin_load_multi.c b/src/main/test_plugin_load_multi.c
index 275fa7a..b7958f2 100644
--- a/src/main/test_plugin_load_multi.c
+++ b/src/main/test_plugin_load_multi.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file main/test_plugin_load_multi.c
diff --git a/src/main/test_plugin_loading.c b/src/main/test_plugin_loading.c
index 787bab5..ddcfb92 100644
--- a/src/main/test_plugin_loading.c
+++ b/src/main/test_plugin_loading.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
diff --git a/src/main/test_trivial.c b/src/main/test_trivial.c
index 7d4076d..fac9a91 100644
--- a/src/main/test_trivial.c
+++ b/src/main/test_trivial.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**