diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index 5913a5098c3605284ccfb466ad57eb40032634ed..a417a7202b6c0254ccd79fc1d91eb0b68687247c 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 a11e4e0857f59268480866c729b02a72e949f644..33aeb47221ab91fd0fdc352d6b0fbfa6f2383f5b 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 9181f618b96330465948ff42a02e02bfee0e0a7b..da7a00ea078ec3d9e1b1c7178ecc49b53a986d55 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 efd6fbaf947d39c4d32119f6309aa23b8114228e..eacfb7ab1d75673f52b377f9e76caa81ba71b2e0 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 87459b25f15ca2671c272618e1493fddce9bfbda..043716c89b66401ee8b3e4664aa0b186cc203ef0 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 d7af99e6a03f228156fb09a1402343183ff333f3..c13bd45a4ee5b8f477da8e79fd5465aa3295f070 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 d864da15e3483afbb1fa1997af10e94baee83a99..d68216e56767f7d675f4905d2ade5e0f650f15b6 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 189aa073264c7e5810f256157892885f0a3177e4..6f8feca4a9d5a3be5bc3ff732c3c97ccec586740 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 94f06df52bcd98bdb594ae09f49d8b2459c1b0ac..966e5827276552f273c82f00f10ff5840d1bdcbf 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 b9186f9601f55ef33c9aa4c9232c476e672882d8..ee593063f59db34e62fab7b7759ab2496a2aec0d 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 7dc69ebe70d7a8c21c138a3b03d4fd4fe36186d4..04ab696ff288c7769a6c745e58811d0fd28e4de9 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 a442806329f0ce8391a2934b8d35637ce1dacf22..deedbf752ff5056395bd959672cbc44beb178774 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 22bf586459932cceab27695add00869a67cc9205..4b8356f20dc8d0f66f5308ff74bd19b74256bcbb 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 4d562ac127c512965fdafbf4da90cafa75e9e57b..6cde9d7cf918df54b2356a2275b0134fc5ece933 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 f3fd5e3a77550af88e68841bad26bda6e841e2ff..bde874e05aa139fedf6905a327f8f3661fb17f4c 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 78f7b5b0f8d4eea0223de8a4b8a6ee4c5e8c68da..b557e2fae29f331101a8733519186e959dac7a8d 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 8aafb5d5532595d070a2cbd19636dd566806f132..98608ba43c572f43667ab715e1fa1d7c34db8c8e 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 6fcdf870b147a384deac714c69304590b2c649f2..6ab2747249c6bb2b14acacbd5534d8f3fef8bb91 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 6d1a4a970b670a57b00a6df1813caaaed66922d0..570a521cfe38d3c1d17e4956f954fcab38ba9602 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 d6fb8b2da75a70f6972e3ecc673c08b3a7e7cea6..cfb76d01ceaf13604d82b46776b49b4cf9ef7904 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 3ad7cfd81884757a8e508da034b49315a73e789f..23c8717a6817538999448371512b12c772d186ee 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 281b62de6272bd4d604ec22369dab9f8db06bd3f..0131e5b69b6e202fd213c8064e186e69aa1e74db 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 792722eaabc91aeded0e5ea393b1685487772ca8..cdb692f62efc13b185963cc74bbec006c024029b 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 e7a4ae219376d8492127410df4d8df57294f3c73..8ccea9d7189432e9278337069ea345fe5ccad096 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 af90781bca5d090fd3771d5a82275f9eeb79e3c3..473a48d660878abcede0fce30e071bfc74111dd2 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 a55584c4462a609446a59fdaa7b756e9a5fbe14c..2a1dfca9e7b535cacf218e14639fa02b0ceeeae4 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 b1b3e7a088a8745f1935713eb81fbfd1d74c375e..af9db476a226e54181b02f9e001bcaafa05e9783 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 112e6c6f39de98b164e7337dc1caa0b833935d35..9f3084574a9009282a88df15416626a836001804 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 e08149e4675b4335e3864eb2dc91d151ea4610b7..1e973bed0d73b597d1463722a53efbc571064e5b 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 d4c76e1f6da788cc1c86736b8e0cd6b88d2844c8..ac4545107a73b4ee2326903b5d5207ecd77c35f8 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 fa61835ae5b9cbc7b48173c6759834e2064cc7f0..56c442d0d46cfbca6b9bf74eab9bcdcee18db6af 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 e17f124f419140564b90b2181da8efca7d7192db..49c6e42608e4cb09dde7f7b52424e8019e0931ff 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 92a262e1c167ab049300f1880c9461a85095a736..e6d7a280f62c6f7e848f1338ee2f831373c14ba3 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 5a819ca436a342e508a7e666dfda46a38232dece..c551ccf0385ec066bf0eaee9ea2cf94000ffb8d3 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 c1bd866428e3e40e7e640ebb58ef26caa377afce..48ca1ec199d64f37b7b3d10fb31d7e5685b3946b 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 58afd4aa7fe59f500106d05ae2935a9805ae6700..da66b132520fec51bc9d6f98726a3c152b46c69e 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 cab419b61a6a32cf7698bcd4d012296aacb8e188..705c87396f96db56bfe3b82217b8f178eab9fa58 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 76aacf93e34770e5ab220e5a41c3c038e6d23a57..d66bcd3086c6a2b2f0200153de03717d1ebf4bb5 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 8b6420d97d02989e5c552ccb9e7b6d64df1177fc..e38f4784c84d726bd2ce266145bc88d0c7023220 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 125afc73fd40cb0cae55a10cd50e6f634ce7dfe2..682fa8f3514976d4b74551b7bcb6168e90c4e855 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 7ae318b4f043585cb8197491904a1942c470483b..47add888beb6f69ff0a10669ff39af5975ca35de 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 3816d8ba7aa214f619c3d141049968881afa9365..0eb2d9b09321febbf37804a866c92013639ebe34 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 7e5b4adecc62cb656a0d85695e4acc6fd9399ef8..d9d12277abc3a5f99aafa48bf3d0c0536fc02eab 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 cc6334bf7f5bf1ff53f2118bd27a90b4b39258b3..d49f3848fe3460d98c789541844ebfe9803b24f7 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 fdeb3f983dc508f35f42de6e60065fe674f0cff9..89b171d3d17cbbc675fc1ea9c91bfa5afb290ff4 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 371d1b5832f27733da00a648555a0b32330cffef..67c278e18645c14ac9aadbff0ad5f6f77581b26d 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 e69d43008bfd3c425dbe1a7483a4116d8e3774e5..0121436b59d51a1f8d013cb9a916b25d146f6c3e 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 ebfa4fdd10e4159cf30ea4f20b1c97c91fecaa7c..4cb6d2dc536d517f44e01ec2db16efd92a0ef583 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 4cd27913e23d8d0bdd8467db76d15600a2f827a4..597183a6ee1e0b6698d61d12c3ad9d25cdcbc1da 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 312936780d8adae014339c5e08afc057a693c96a..29b08fb947e17aa0ed84708ced7e8d3bceb597c6 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 aca9396147a6874adc00af96f0913d01d6da7858..b3aa14a27e4c5b7a31a0820a9570917c438f29bc 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 6302fca5b84e6175a9dd381f34a0b222e343077d..254061c801a697b7568d2484efc46f19c95cb015 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 2fc81cf5d4d7ee800460ccef3cd298bacedbc9f6..ea81b5798007a459de9052979a5771bdb576d635 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 5b0993b74404ec663a09ffe7f3c997ac088a43a6..65e313202ea63a0ccf758403ff15ea68e508e4e2 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 6f7362f916b7f6075bbf2772572a2dfafed940d6..c4b8e2bff29eefb46538ffde85ebb175f3ca67ec 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 cb239e886ba3b69b6da93caa8eddf0261af66076..7bddcd4878749df48f09f879c8652121bdcb1320 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 7eedeac253dbd60349f86b469c8ac785890424b9..608cb9c323555cff6c304fdb01f322320c48d0f8 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 00e4afe73dfdcf1a0c493587523d2c1a1503d53c..1e3eeda8144412d42f2a7b6d11159e57280c67e3 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 52e3113408575a8f00e955c22e05ec8ca85b4a79..135229cc314d6fd55b6fc6339d1ed0a46b7cf1e5 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 967a0c32326a45a44444006bef060dd94784f926..2739414c910fcb3c00a61aa7dd5c793ba2644112 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 3d0aa8e5021d1bff55a6aeb0d46b92a07581971f..05a2fcb6fb63528a3613285d9db42fe3028a00f0 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 0f49bbbc5a4520e9ab6653f9c2a53500e04c2312..3b28c6929ea8bf4549f54754481f2971164f61ec 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 32363833eee051e387137be3b6778e93989b4b96..a8c5bdc9f22ac2f654873ad7bbbdb94d9201ae3b 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 e22d518e9476daa515f7b24ac7be2c4552ea9690..b26870886d72884abea9270bbc17f928429cd219 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 4d6f9b4ecc927e5fe56159d9800e2645853b4ce6..35375276d97dc5269f25ab7c94a72d5d11f92524 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 d169a6fa3ec2f5b2404bfc88d83cb84cfa72bd85..dc68f598da8284c0cae8ff745c3eb33d3e72a1c0 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 0e823c16479a0d3c62f144d42bb5399035880b1b..c62508f0377ce3f237131a24b80937995e3f7b6a 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 51645e9e650b386839804007bbc75cc1ea777b45..47e8f420a1cfc7b9f4baac21693512960cf477ce 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 9199fb2be0d306cd636a7b4ac865879fc10e929b..f24aebedd85147217d74cff4b35a7ed987ea9650 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 2183122af804630c61416e9d3a62ae60c074039e..7aeb6feb5a4139a356ca87ab72187ee33bcebfe9 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 4b3997490dbf52d6296365f5fac16e0c486ff976..0712325a23d75742f2b9976327212177b1c03b19 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 ee7def05fa985dc7785edd4baff2d172e1570b64..bb06cc1bbb67c340f142b4e2325ff02e6ef3be1b 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 7654d9cf995a435606b5074b75dc52ae3f77df12..ab5d0b3753817dd6eb9c7dc16d9da4c9609759b4 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 96d7b9a6c8e377f5131fd0e8e0091f49d55e0525..2e046bd4c95519fbbda92b1cec3169158d81b296 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 31ef8d2de879bdc3ae2edcbedc4dc728c38f80e5..fa1936e8dc7c0efa0d526ed8811ee6f14dc047d8 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 96efc1cafce40bc076a3805a54625a4e2ad6e8f3..54dbeda2752f2e49703f1630d7b1270cde5d5e81 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 eb9d67bcd4cebb7f9139bde18d8e202b393a73e3..69b56c8d0adf815314134dc511dd45e449898996 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 6ad3ea2b278fa47781ca4317237181bde753ce05..055b7f139dd29a1019efcdd99eb606d511d1c52b 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 a223019e7bd435f0cdd43b4c1d22dad0bdc37d65..442c425c573fc9d4c7e0821dc76d49cbc9357836 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 48f6f40860632b087263507187c69bdf9157b141..c2c66d1dd1cd572138de826751dcbd28de65d07e 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 d44b8c80ddc45cb3f44e20491aaf2e226cda7b7f..71fa6797a372c300c84ada5b9d1727868a721dfe 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 a580e7fb68f46a31e87df50163e6c934f0014eda..1e599a43bf1affc2627dc4c83d4839332c317005 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 433241cea7182e5a5e5f317632418dbf3432a908..a81285cfc46b18377e65691fe3bb31ed0c4a3ec6 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 65aae7a94e1dc0254c2145f2d5a209f117258f32..bc7e1cebebc88998e8fff94fb2c12eecb1f33341 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 3c32dda40350701b0add08ff293baa9021a0cc57..b65747d0973897d12bb028c72f2dc43df9d12d54 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 4c5ca4d4752d53f500b584edefaa062b7a624812..f981edb1aff273e7560fdbf96a5b2cad974c7176 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 067e315def6fc45df6a0fb22ad9fb720ab40ca2a..a2500afec48020bc6d38fc98438668d33ff9cbd6 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 874fb3443c41577edee23b0fa191964af5bdf55d..f12a9f62dbf890b74e8eb783628827688d2f909b 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 d33059f98eea2fa8cde1c71321b80ce189abe037..d36e3bce8152a1a2d5d4a72f451077ce7d4be3ae 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 24b0cc4b4681736128a9912733b9d6b410e60be3..542896e9a76f5b487bb25b3aa7b69149c3ebb654 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 88f6ffbe8fc7d69f194682089b83a15726bd9a73..5e4c78b9b226601e25943b4c8d2af75460b1c683 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 2d6c7f9e68418db7c54c3eab9233b3786a103649..9ebef113c3b817ae9f39b2f22e7c163bff0c8602 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 3c7b578ca1bf6abcb4728bad1f98ee26bf959e21..0f93c70b361ae88d627ba015e85bcaa3cb9c385e 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 348f8289fcfa975fa409d249c3e0db619cc945a5..98dafadd58701e34dbc174c5391523fac1f02f4a 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 808140942865a1ead65f70a71c0bcf11df775915..12a3010ddf0534810da7651b5654574e584b29a4 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 937751038417363f62ea248fe2a5966360da819a..db3db135105eaeada19bcaf37e7bbe18a3f8580e 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 87e7dc18d397433e03506122ec85d104995e016c..86a670af801ae84ac4286546765513504bd1fc79 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 9f4abc2c0a886677fdcf4740e07947e361a17a81..b5eef8e9c8b4544e81ee7fc64d4a1cc131eeca53 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 37151ee4d6fa1657de2e9bb4a5bec587f689a01a..44dc8eb7c67497c9ad9e197d6345738f5cdb4c3f 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 02f9b93f169d55400bdeb83d3345067d8264fbca..37c98f4bcef2b2fc36428e34638268763401d415 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 887f4dd329600ce018f2fe1f89e9a54197f5eb0c..6c297117f7c7b747474546c5c01bab947b59fb09 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 a8c46dd24b962965ef411d470428e76a1f82390d..152f0866f7580ce148e55123ddef38ea99f609b9 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 f6a9ea19aefdc4611b6e8f96c5d5ae165b081cb5..1e1deea7d9d6b1536e5923a205b0a07908597707 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  */