From 9cbdb9728e6d45c1c8220f752c8e3a86d40df2c7 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Mon, 8 Aug 2011 00:16:40 +0200
Subject: [PATCH] Fixes: #330 FSF address incorrect in source code and
 documentation files

---
 include/accept-to-gettext.inc                                   | 2 +-
 include/class_CopyPasteHandler.inc                              | 2 +-
 include/class_SnapShotDialog.inc                                | 2 +-
 include/class_SnapshotHandler.inc                               | 2 +-
 include/class_acl.inc                                           | 2 +-
 include/class_baseSelector.inc                                  | 2 +-
 include/class_certificate.inc                                   | 2 +-
 include/class_config.inc                                        | 2 +-
 include/class_departmentSortIterator.inc                        | 2 +-
 include/class_divSelectBox.inc                                  | 2 +-
 include/class_divlist.inc                                       | 2 +-
 include/class_filter.inc                                        | 2 +-
 include/class_filterLDAP.inc                                    | 2 +-
 include/class_gosaSupportDaemon.inc                             | 2 +-
 include/class_ldap.inc                                          | 2 +-
 include/class_ldapMultiplexer.inc                               | 2 +-
 include/class_listing.inc                                       | 2 +-
 include/class_listingSortIterator.inc                           | 2 +-
 include/class_log.inc                                           | 2 +-
 include/class_management.inc                                    | 2 +-
 include/class_msg_dialog.inc                                    | 2 +-
 include/class_multi_plug.inc                                    | 2 +-
 include/class_plugin.inc                                        | 2 +-
 include/class_pluglist.inc                                      | 2 +-
 include/class_session.inc                                       | 2 +-
 include/class_socketClient.inc                                  | 2 +-
 include/class_sortableListing.inc                               | 2 +-
 include/class_tabs.inc                                          | 2 +-
 include/class_userinfo.inc                                      | 2 +-
 include/exporter/class_PDF.inc                                  | 2 +-
 include/exporter/class_cvsExporter.inc                          | 2 +-
 include/exporter/class_pdfExporter.inc                          | 2 +-
 include/functions.inc                                           | 2 +-
 include/password-methods/class_password-methods-clear.inc       | 2 +-
 include/password-methods/class_password-methods-crypt.inc       | 2 +-
 include/password-methods/class_password-methods-md5.inc         | 2 +-
 include/password-methods/class_password-methods-sha.inc         | 2 +-
 include/password-methods/class_password-methods-smd5.inc        | 2 +-
 include/password-methods/class_password-methods-ssha.inc        | 2 +-
 include/password-methods/class_password-methods.inc             | 2 +-
 include/php_setup.inc                                           | 2 +-
 include/utils/class_msgPool.inc                                 | 2 +-
 include/utils/class_tests.inc                                   | 2 +-
 include/utils/class_timezone.inc                                | 2 +-
 include/utils/class_xml.inc                                     | 2 +-
 plugins/admin/acl/class_aclManagement.inc                       | 2 +-
 plugins/admin/acl/class_aclRole.inc                             | 2 +-
 plugins/admin/acl/class_filterACL.inc                           | 2 +-
 plugins/admin/acl/main.inc                                      | 2 +-
 plugins/admin/acl/tabs_acl.inc                                  | 2 +-
 plugins/admin/acl/tabs_acl_role.inc                             | 2 +-
 plugins/admin/departments/class_countryGeneric.inc              | 2 +-
 plugins/admin/departments/class_dcObject.inc                    | 2 +-
 plugins/admin/departments/class_department.inc                  | 2 +-
 plugins/admin/departments/class_departmentManagement.inc        | 2 +-
 plugins/admin/departments/class_domain.inc                      | 2 +-
 plugins/admin/departments/class_localityGeneric.inc             | 2 +-
 plugins/admin/departments/class_organizationGeneric.inc         | 2 +-
 plugins/admin/departments/main.inc                              | 2 +-
 plugins/admin/departments/tabs_department.inc                   | 2 +-
 plugins/admin/groups/class_filterGroupLDAP.inc                  | 2 +-
 plugins/admin/groups/class_group.inc                            | 2 +-
 plugins/admin/groups/class_groupManagement.inc                  | 2 +-
 plugins/admin/groups/main.inc                                   | 2 +-
 .../admin/groups/singleUserSelect/class_singleUserSelect.inc    | 2 +-
 plugins/admin/groups/tabs_group.inc                             | 2 +-
 plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc  | 2 +-
 plugins/admin/groups/userSelect/class_userSelect.inc            | 2 +-
 plugins/admin/ogroups/class_ogroup.inc                          | 2 +-
 plugins/admin/ogroups/class_ogroupManagement.inc                | 2 +-
 plugins/admin/ogroups/main.inc                                  | 2 +-
 .../objectSelect/class_filterLDAPDepartmentBlacklist.inc        | 2 +-
 plugins/admin/ogroups/objectSelect/class_objectSelect.inc       | 2 +-
 plugins/admin/ogroups/tabs_ogroups.inc                          | 2 +-
 plugins/admin/users/class_userManagement.inc                    | 2 +-
 plugins/admin/users/main.inc                                    | 2 +-
 plugins/admin/users/tabs_user.inc                               | 2 +-
 plugins/generic/references/class_reference.inc                  | 2 +-
 plugins/generic/welcome/main.inc                                | 2 +-
 plugins/personal/generic/class_user.inc                         | 2 +-
 plugins/personal/generic/main.inc                               | 2 +-
 plugins/personal/password/class_password.inc                    | 2 +-
 plugins/personal/password/main.inc                              | 2 +-
 plugins/personal/posix/class_posixAccount.inc                   | 2 +-
 .../personal/posix/groupSelect/class_filterLDAPBlacklist.inc    | 2 +-
 plugins/personal/posix/groupSelect/class_groupSelect.inc        | 2 +-
 plugins/personal/posix/main.inc                                 | 2 +-
 plugins/personal/posix/trustSelect/class_trustSelect.inc        | 2 +-
 setup/class_setup.inc                                           | 2 +-
 setup/class_setupStep.inc                                       | 2 +-
 setup/class_setupStep_Checks.inc                                | 2 +-
 setup/class_setupStep_Config1.inc                               | 2 +-
 setup/class_setupStep_Config2.inc                               | 2 +-
 setup/class_setupStep_Config3.inc                               | 2 +-
 setup/class_setupStep_Feedback.inc                              | 2 +-
 setup/class_setupStep_Finish.inc                                | 2 +-
 setup/class_setupStep_Language.inc                              | 2 +-
 setup/class_setupStep_Ldap.inc                                  | 2 +-
 setup/class_setupStep_License.inc                               | 2 +-
 setup/class_setupStep_Migrate.inc                               | 2 +-
 setup/class_setupStep_Schema.inc                                | 2 +-
 setup/class_setupStep_Welcome.inc                               | 2 +-
 setup/main.inc                                                  | 2 +-
 103 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index 5913a5098..a417a7202 100644
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Usage:
  *
diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index a11e4e085..33aeb4722 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #define("TEMP_DIR","/var/cache/fusiondirectory/tmp");
diff --git a/include/class_SnapShotDialog.inc b/include/class_SnapShotDialog.inc
index 9181f618b..da7a00ea0 100644
--- a/include/class_SnapShotDialog.inc
+++ b/include/class_SnapShotDialog.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/include/class_SnapshotHandler.inc b/include/class_SnapshotHandler.inc
index efd6fbaf9..eacfb7ab1 100644
--- a/include/class_SnapshotHandler.inc
+++ b/include/class_SnapshotHandler.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class SnapshotHandler {
diff --git a/include/class_acl.inc b/include/class_acl.inc
index 87459b25f..043716c89 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*! \brief ACL management plugin */ 
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index d7af99e6a..c13bd45a4 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class baseSelector {
diff --git a/include/class_certificate.inc b/include/class_certificate.inc
index d864da15e..d68216e56 100644
--- a/include/class_certificate.inc
+++ b/include/class_certificate.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* definitions */
diff --git a/include/class_config.inc b/include/class_config.inc
index 189aa0732..6f8feca4a 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*! \brief Configuration class
diff --git a/include/class_departmentSortIterator.inc b/include/class_departmentSortIterator.inc
index 94f06df52..966e58272 100644
--- a/include/class_departmentSortIterator.inc
+++ b/include/class_departmentSortIterator.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class departmentSortIterator implements Iterator {
diff --git a/include/class_divSelectBox.inc b/include/class_divSelectBox.inc
index b9186f960..ee593063f 100644
--- a/include/class_divSelectBox.inc
+++ b/include/class_divSelectBox.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class divSelectBox {
diff --git a/include/class_divlist.inc b/include/class_divlist.inc
index 7dc69ebe7..04ab696ff 100644
--- a/include/class_divlist.inc
+++ b/include/class_divlist.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class divlist {
diff --git a/include/class_filter.inc b/include/class_filter.inc
index a44280632..deedbf752 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filter {
diff --git a/include/class_filterLDAP.inc b/include/class_filterLDAP.inc
index 22bf58645..4b8356f20 100644
--- a/include/class_filterLDAP.inc
+++ b/include/class_filterLDAP.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filterLDAP {
diff --git a/include/class_gosaSupportDaemon.inc b/include/class_gosaSupportDaemon.inc
index 4d562ac12..6cde9d7cf 100644
--- a/include/class_gosaSupportDaemon.inc
+++ b/include/class_gosaSupportDaemon.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class gosaSupportDaemon
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index f3fd5e3a7..bde874e05 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -19,7 +19,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 define("ALREADY_EXISTING_ENTRY",-10001);
diff --git a/include/class_ldapMultiplexer.inc b/include/class_ldapMultiplexer.inc
index 78f7b5b0f..b557e2fae 100644
--- a/include/class_ldapMultiplexer.inc
+++ b/include/class_ldapMultiplexer.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class ldapMultiplexer {
diff --git a/include/class_listing.inc b/include/class_listing.inc
index 8aafb5d55..98608ba43 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class listing {
diff --git a/include/class_listingSortIterator.inc b/include/class_listingSortIterator.inc
index 6fcdf870b..6ab274724 100644
--- a/include/class_listingSortIterator.inc
+++ b/include/class_listingSortIterator.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class listingSortIterator implements Iterator {
diff --git a/include/class_log.inc b/include/class_log.inc
index 6d1a4a970..570a521cf 100644
--- a/include/class_log.inc
+++ b/include/class_log.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*! \brief   The logging base class
diff --git a/include/class_management.inc b/include/class_management.inc
index d6fb8b2da..cfb76d01c 100644
--- a/include/class_management.inc
+++ b/include/class_management.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class management
diff --git a/include/class_msg_dialog.inc b/include/class_msg_dialog.inc
index 3ad7cfd81..23c8717a6 100644
--- a/include/class_msg_dialog.inc
+++ b/include/class_msg_dialog.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 define("INFO_DIALOG"		, 10001);
diff --git a/include/class_multi_plug.inc b/include/class_multi_plug.inc
index 281b62de6..0131e5b69 100644
--- a/include/class_multi_plug.inc
+++ b/include/class_multi_plug.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 792722eaa..cdb692f62 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index e7a4ae219..8ccea9d71 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class pluglist {
diff --git a/include/class_session.inc b/include/class_session.inc
index af90781bc..473a48d66 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class session {
diff --git a/include/class_socketClient.inc b/include/class_socketClient.inc
index a55584c44..2a1dfca9e 100644
--- a/include/class_socketClient.inc
+++ b/include/class_socketClient.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Socket_Client
diff --git a/include/class_sortableListing.inc b/include/class_sortableListing.inc
index b1b3e7a08..af9db476a 100644
--- a/include/class_sortableListing.inc
+++ b/include/class_sortableListing.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 define ('LIST_NORMAL', 0);
diff --git a/include/class_tabs.inc b/include/class_tabs.inc
index 112e6c6f3..9f3084574 100644
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class tabs
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index e08149e46..1e973bed0 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class userinfo
diff --git a/include/exporter/class_PDF.inc b/include/exporter/class_PDF.inc
index d4c76e1f6..ac4545107 100644
--- a/include/exporter/class_PDF.inc
+++ b/include/exporter/class_PDF.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Avoid autoloading this class */ class PDF extends FPDF
diff --git a/include/exporter/class_cvsExporter.inc b/include/exporter/class_cvsExporter.inc
index fa61835ae..56c442d0d 100644
--- a/include/exporter/class_cvsExporter.inc
+++ b/include/exporter/class_cvsExporter.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class csvExporter
diff --git a/include/exporter/class_pdfExporter.inc b/include/exporter/class_pdfExporter.inc
index e17f124f4..49c6e4260 100644
--- a/include/exporter/class_pdfExporter.inc
+++ b/include/exporter/class_pdfExporter.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/include/functions.inc b/include/functions.inc
index 92a262e1c..e6d7a280f 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*! \file
diff --git a/include/password-methods/class_password-methods-clear.inc b/include/password-methods/class_password-methods-clear.inc
index 5a819ca43..c551ccf03 100644
--- a/include/password-methods/class_password-methods-clear.inc
+++ b/include/password-methods/class_password-methods-clear.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodClear extends passwordMethod
diff --git a/include/password-methods/class_password-methods-crypt.inc b/include/password-methods/class_password-methods-crypt.inc
index c1bd86642..48ca1ec19 100644
--- a/include/password-methods/class_password-methods-crypt.inc
+++ b/include/password-methods/class_password-methods-crypt.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodCrypt extends passwordMethod
diff --git a/include/password-methods/class_password-methods-md5.inc b/include/password-methods/class_password-methods-md5.inc
index 58afd4aa7..da66b1325 100644
--- a/include/password-methods/class_password-methods-md5.inc
+++ b/include/password-methods/class_password-methods-md5.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodMd5 extends passwordMethod
diff --git a/include/password-methods/class_password-methods-sha.inc b/include/password-methods/class_password-methods-sha.inc
index cab419b61..705c87396 100644
--- a/include/password-methods/class_password-methods-sha.inc
+++ b/include/password-methods/class_password-methods-sha.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodsha extends passwordMethod
diff --git a/include/password-methods/class_password-methods-smd5.inc b/include/password-methods/class_password-methods-smd5.inc
index 76aacf93e..d66bcd308 100644
--- a/include/password-methods/class_password-methods-smd5.inc
+++ b/include/password-methods/class_password-methods-smd5.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodsmd5 extends passwordMethod
diff --git a/include/password-methods/class_password-methods-ssha.inc b/include/password-methods/class_password-methods-ssha.inc
index 8b6420d97..e38f4784c 100644
--- a/include/password-methods/class_password-methods-ssha.inc
+++ b/include/password-methods/class_password-methods-ssha.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodssha extends passwordMethod
diff --git a/include/password-methods/class_password-methods.inc b/include/password-methods/class_password-methods.inc
index 125afc73f..682fa8f35 100644
--- a/include/password-methods/class_password-methods.inc
+++ b/include/password-methods/class_password-methods.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethod
diff --git a/include/php_setup.inc b/include/php_setup.inc
index 7ae318b4f..47add888b 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 define ("LOCALE_DIR", dirname(dirname(__FILE__))."/locale/compiled");
diff --git a/include/utils/class_msgPool.inc b/include/utils/class_msgPool.inc
index 3816d8ba7..0eb2d9b09 100644
--- a/include/utils/class_msgPool.inc
+++ b/include/utils/class_msgPool.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/include/utils/class_tests.inc b/include/utils/class_tests.inc
index 7e5b4adec..d9d12277a 100644
--- a/include/utils/class_tests.inc
+++ b/include/utils/class_tests.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*! \brief Test functions
diff --git a/include/utils/class_timezone.inc b/include/utils/class_timezone.inc
index cc6334bf7..d49f3848f 100644
--- a/include/utils/class_timezone.inc
+++ b/include/utils/class_timezone.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class timezone {
diff --git a/include/utils/class_xml.inc b/include/utils/class_xml.inc
index fdeb3f983..89b171d3d 100644
--- a/include/utils/class_xml.inc
+++ b/include/utils/class_xml.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class xml {
diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index 371d1b583..67c278e18 100644
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class aclManagement extends management
diff --git a/plugins/admin/acl/class_aclRole.inc b/plugins/admin/acl/class_aclRole.inc
index e69d43008..0121436b5 100644
--- a/plugins/admin/acl/class_aclRole.inc
+++ b/plugins/admin/acl/class_aclRole.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class aclrole extends acl
diff --git a/plugins/admin/acl/class_filterACL.inc b/plugins/admin/acl/class_filterACL.inc
index ebfa4fdd1..4cb6d2dc5 100644
--- a/plugins/admin/acl/class_filterACL.inc
+++ b/plugins/admin/acl/class_filterACL.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filterACL {
diff --git a/plugins/admin/acl/main.inc b/plugins/admin/acl/main.inc
index 4cd27913e..597183a6e 100644
--- a/plugins/admin/acl/main.inc
+++ b/plugins/admin/acl/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin
diff --git a/plugins/admin/acl/tabs_acl.inc b/plugins/admin/acl/tabs_acl.inc
index 312936780..29b08fb94 100644
--- a/plugins/admin/acl/tabs_acl.inc
+++ b/plugins/admin/acl/tabs_acl.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class acltab extends tabs
diff --git a/plugins/admin/acl/tabs_acl_role.inc b/plugins/admin/acl/tabs_acl_role.inc
index aca939614..b3aa14a27 100644
--- a/plugins/admin/acl/tabs_acl_role.inc
+++ b/plugins/admin/acl/tabs_acl_role.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class aclroletab extends tabs
diff --git a/plugins/admin/departments/class_countryGeneric.inc b/plugins/admin/departments/class_countryGeneric.inc
index 6302fca5b..254061c80 100644
--- a/plugins/admin/departments/class_countryGeneric.inc
+++ b/plugins/admin/departments/class_countryGeneric.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class country extends department
diff --git a/plugins/admin/departments/class_dcObject.inc b/plugins/admin/departments/class_dcObject.inc
index 2fc81cf5d..ea81b5798 100644
--- a/plugins/admin/departments/class_dcObject.inc
+++ b/plugins/admin/departments/class_dcObject.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class dcObject extends department
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index 5b0993b74..65e313202 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class department extends plugin
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index 6f7362f91..c4b8e2bff 100644
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class departmentManagement extends management
diff --git a/plugins/admin/departments/class_domain.inc b/plugins/admin/departments/class_domain.inc
index cb239e886..7bddcd487 100644
--- a/plugins/admin/departments/class_domain.inc
+++ b/plugins/admin/departments/class_domain.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class domain extends department
diff --git a/plugins/admin/departments/class_localityGeneric.inc b/plugins/admin/departments/class_localityGeneric.inc
index 7eedeac25..608cb9c32 100644
--- a/plugins/admin/departments/class_localityGeneric.inc
+++ b/plugins/admin/departments/class_localityGeneric.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class locality extends department
diff --git a/plugins/admin/departments/class_organizationGeneric.inc b/plugins/admin/departments/class_organizationGeneric.inc
index 00e4afe73..1e3eeda81 100644
--- a/plugins/admin/departments/class_organizationGeneric.inc
+++ b/plugins/admin/departments/class_organizationGeneric.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class organization extends department
diff --git a/plugins/admin/departments/main.inc b/plugins/admin/departments/main.inc
index 52e311340..135229cc3 100644
--- a/plugins/admin/departments/main.inc
+++ b/plugins/admin/departments/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index 967a0c323..2739414c9 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class deptabs extends tabs
diff --git a/plugins/admin/groups/class_filterGroupLDAP.inc b/plugins/admin/groups/class_filterGroupLDAP.inc
index 3d0aa8e50..05a2fcb6f 100644
--- a/plugins/admin/groups/class_filterGroupLDAP.inc
+++ b/plugins/admin/groups/class_filterGroupLDAP.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filterGroupLDAP {
diff --git a/plugins/admin/groups/class_group.inc b/plugins/admin/groups/class_group.inc
index 0f49bbbc5..3b28c6929 100644
--- a/plugins/admin/groups/class_group.inc
+++ b/plugins/admin/groups/class_group.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class group extends plugin
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 32363833e..a8c5bdc9f 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class groupManagement extends management
diff --git a/plugins/admin/groups/main.inc b/plugins/admin/groups/main.inc
index e22d518e9..b26870886 100644
--- a/plugins/admin/groups/main.inc
+++ b/plugins/admin/groups/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc b/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc
index 4d6f9b4ec..35375276d 100644
--- a/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc
+++ b/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class singleUserSelect extends management
diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc
index d169a6fa3..dc68f598d 100644
--- a/plugins/admin/groups/tabs_group.inc
+++ b/plugins/admin/groups/tabs_group.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class grouptabs extends tabs
diff --git a/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc b/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
index 0e823c164..c62508f03 100644
--- a/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
+++ b/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class userGroupSelect extends management
diff --git a/plugins/admin/groups/userSelect/class_userSelect.inc b/plugins/admin/groups/userSelect/class_userSelect.inc
index 51645e9e6..47e8f420a 100644
--- a/plugins/admin/groups/userSelect/class_userSelect.inc
+++ b/plugins/admin/groups/userSelect/class_userSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class userSelect extends management
diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index 9199fb2be..f24aebedd 100644
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Sort multidimensional arrays for key 'text' */
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 2183122af..7aeb6feb5 100644
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class ogroupManagement extends management
diff --git a/plugins/admin/ogroups/main.inc b/plugins/admin/ogroups/main.inc
index 4b3997490..0712325a2 100644
--- a/plugins/admin/ogroups/main.inc
+++ b/plugins/admin/ogroups/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc b/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
index ee7def05f..bb06cc1bb 100644
--- a/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
+++ b/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filterLDAPDepartmentBlacklist  extends filterLDAPBlacklist{
diff --git a/plugins/admin/ogroups/objectSelect/class_objectSelect.inc b/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
index 7654d9cf9..ab5d0b375 100644
--- a/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
+++ b/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class objectSelect extends management
diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index 96d7b9a6c..2e046bd4c 100644
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class ogrouptabs extends tabs
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 31ef8d2de..fa1936e8d 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class userManagement extends management
diff --git a/plugins/admin/users/main.inc b/plugins/admin/users/main.inc
index 96efc1caf..54dbeda27 100644
--- a/plugins/admin/users/main.inc
+++ b/plugins/admin/users/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/admin/users/tabs_user.inc b/plugins/admin/users/tabs_user.inc
index eb9d67bcd..69b56c8d0 100644
--- a/plugins/admin/users/tabs_user.inc
+++ b/plugins/admin/users/tabs_user.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class usertabs extends tabs
diff --git a/plugins/generic/references/class_reference.inc b/plugins/generic/references/class_reference.inc
index 6ad3ea2b2..055b7f139 100644
--- a/plugins/generic/references/class_reference.inc
+++ b/plugins/generic/references/class_reference.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class reference extends plugin
diff --git a/plugins/generic/welcome/main.inc b/plugins/generic/welcome/main.inc
index a223019e7..442c425c5 100644
--- a/plugins/generic/welcome/main.inc
+++ b/plugins/generic/welcome/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 if (!$cleanup){
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 48f6f4086..c2c66d1dd 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*!
diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc
index d44b8c80d..71fa6797a 100644
--- a/plugins/personal/generic/main.inc
+++ b/plugins/personal/generic/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/personal/password/class_password.inc b/plugins/personal/password/class_password.inc
index a580e7fb6..1e599a43b 100644
--- a/plugins/personal/password/class_password.inc
+++ b/plugins/personal/password/class_password.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class password extends plugin
diff --git a/plugins/personal/password/main.inc b/plugins/personal/password/main.inc
index 433241cea..a81285cfc 100644
--- a/plugins/personal/password/main.inc
+++ b/plugins/personal/password/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin  */
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 65aae7a94..bc7e1cebe 100644
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*!
diff --git a/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc b/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
index 3c32dda40..b65747d09 100644
--- a/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
+++ b/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filterLDAPBlacklist {
diff --git a/plugins/personal/posix/groupSelect/class_groupSelect.inc b/plugins/personal/posix/groupSelect/class_groupSelect.inc
index 4c5ca4d47..f981edb1a 100644
--- a/plugins/personal/posix/groupSelect/class_groupSelect.inc
+++ b/plugins/personal/posix/groupSelect/class_groupSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class groupSelect extends management
diff --git a/plugins/personal/posix/main.inc b/plugins/personal/posix/main.inc
index 067e315de..a2500afec 100644
--- a/plugins/personal/posix/main.inc
+++ b/plugins/personal/posix/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/personal/posix/trustSelect/class_trustSelect.inc b/plugins/personal/posix/trustSelect/class_trustSelect.inc
index 874fb3443..f12a9f62d 100644
--- a/plugins/personal/posix/trustSelect/class_trustSelect.inc
+++ b/plugins/personal/posix/trustSelect/class_trustSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class trustSelect extends management
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index d33059f98..d36e3bce8 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 require_once("class_setupStep.inc");
diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index 24b0cc4b4..542896e9a 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class setup_step extends plugin
diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc
index 88f6ffbe8..5e4c78b9b 100644
--- a/setup/class_setupStep_Checks.inc
+++ b/setup/class_setupStep_Checks.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Checks extends setup_step
diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 2d6c7f9e6..9ebef113c 100644
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Config1 extends setup_step
diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 3c7b578ca..0f93c70b3 100644
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 348f8289f..98dafadd5 100644
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/setup/class_setupStep_Feedback.inc b/setup/class_setupStep_Feedback.inc
index 808140942..12a3010dd 100644
--- a/setup/class_setupStep_Feedback.inc
+++ b/setup/class_setupStep_Feedback.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index 937751038..db3db1351 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Finish extends setup_step
diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index 87e7dc18d..86a670af8 100644
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc
index 9f4abc2c0..b5eef8e9c 100644
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStep_Ldap.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Ldap extends setup_step
diff --git a/setup/class_setupStep_License.inc b/setup/class_setupStep_License.inc
index 37151ee4d..44dc8eb7c 100644
--- a/setup/class_setupStep_License.inc
+++ b/setup/class_setupStep_License.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_License extends setup_step
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 02f9b93f1..37c98f4bc 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /****************
diff --git a/setup/class_setupStep_Schema.inc b/setup/class_setupStep_Schema.inc
index 887f4dd32..6c297117f 100644
--- a/setup/class_setupStep_Schema.inc
+++ b/setup/class_setupStep_Schema.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Schema extends setup_step
diff --git a/setup/class_setupStep_Welcome.inc b/setup/class_setupStep_Welcome.inc
index a8c46dd24..152f0866f 100644
--- a/setup/class_setupStep_Welcome.inc
+++ b/setup/class_setupStep_Welcome.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Welcome  extends setup_step
diff --git a/setup/main.inc b/setup/main.inc
index f6a9ea19a..1e1deea7d 100644
--- a/setup/main.inc
+++ b/setup/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Create a new setup class if necessary  */
-- 
GitLab