diff --git a/debian/copyright b/debian/copyright
index ffc9010..c1bb05f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,8 +23,7 @@ Copyright:
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * As a special exception, isync may be linked with the OpenSSL library,
  * despite that library's more restrictive license.
diff --git a/src/compat/config.c b/src/compat/config.c
index 02115b9..d68f2c1 100644
--- a/src/compat/config.c
+++ b/src/compat/config.c
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "isync.h"
diff --git a/src/compat/convert.c b/src/compat/convert.c
index 3bd8879..19209aa 100644
--- a/src/compat/convert.c
+++ b/src/compat/convert.c
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "isync.h"
diff --git a/src/compat/isync.1 b/src/compat/isync.1
index 9c4f6dc..ff68b94 100644
--- a/src/compat/isync.1
+++ b/src/compat/isync.1
@@ -14,8 +14,7 @@
 \"  GNU General Public License for more details.
 \"
 \"  You should have received a copy of the GNU General Public License
-\"  along with this program; if not, write to the Free Software Foundation,
-\"  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+\"  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \"
 ..
 .TH isync 1 "2004 Mar 29"
diff --git a/src/compat/isync.h b/src/compat/isync.h
index 09ec283..a1aee3f 100644
--- a/src/compat/isync.h
+++ b/src/compat/isync.h
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/compat/main.c b/src/compat/main.c
index 10ade7f..83fff5a 100644
--- a/src/compat/main.c
+++ b/src/compat/main.c
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "isync.h"
diff --git a/src/compat/util.c b/src/compat/util.c
index 1cb0f79..cca2072 100644
--- a/src/compat/util.c
+++ b/src/compat/util.c
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "isync.h"
diff --git a/src/config.c b/src/config.c
index 658d7f8..e211ce2 100644
--- a/src/config.c
+++ b/src/config.c
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * As a special exception, mbsync may be linked with the OpenSSL library,
  * despite that library's more restrictive license.
diff --git a/src/drv_imap.c b/src/drv_imap.c
index 7982381..66f4d7c 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -15,8 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * As a special exception, mbsync may be linked with the OpenSSL library,
  * despite that library's more restrictive license.
diff --git a/src/drv_maildir.c b/src/drv_maildir.c
index 74d7b9c..faf7ac2 100644
--- a/src/drv_maildir.c
+++ b/src/drv_maildir.c
@@ -15,8 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * As a special exception, mbsync may be linked with the OpenSSL library,
  * despite that library's more restrictive license.
diff --git a/src/isync.h b/src/isync.h
index a60e468..2099692 100644
--- a/src/isync.h
+++ b/src/isync.h
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * As a special exception, mbsync may be linked with the OpenSSL library,
  * despite that library's more restrictive license.
diff --git a/src/main.c b/src/main.c
index 1535a30..85cbf34 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * As a special exception, mbsync may be linked with the OpenSSL library,
  * despite that library's more restrictive license.
diff --git a/src/mbsync.1 b/src/mbsync.1
index 3b2fa62..906dbca 100644
--- a/src/mbsync.1
+++ b/src/mbsync.1
@@ -15,8 +15,7 @@
 \"  GNU General Public License for more details.
 \"
 \"  You should have received a copy of the GNU General Public License
-\"  along with this program; if not, write to the Free Software Foundation,
-\"  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+\"  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \"
 \" As a special exception, mbsync may be linked with the OpenSSL library,
 \" despite that library's more restrictive license.
diff --git a/src/mdconvert.1 b/src/mdconvert.1
index 30ca7b6..17f0789 100644
--- a/src/mdconvert.1
+++ b/src/mdconvert.1
@@ -13,8 +13,7 @@
 \"  GNU General Public License for more details.
 \"
 \"  You should have received a copy of the GNU General Public License
-\"  along with this program; if not, write to the Free Software Foundation,
-\"  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+\"  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ..
 .TH mdconvert 1 "2004 Mar 27"
 ..
diff --git a/src/mdconvert.c b/src/mdconvert.c
index 7dbfb48..2eefff6 100644
--- a/src/mdconvert.c
+++ b/src/mdconvert.c
@@ -13,8 +13,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/run-tests.pl b/src/run-tests.pl
index 842e6e6..9924f33 100755
--- a/src/run-tests.pl
+++ b/src/run-tests.pl
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 use strict;
diff --git a/src/socket.c b/src/socket.c
index f9c8a05..e952957 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -15,8 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * As a special exception, mbsync may be linked with the OpenSSL library,
  * despite that library's more restrictive license.
diff --git a/src/sync.c b/src/sync.c
index d9be535..d3fc974 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * As a special exception, mbsync may be linked with the OpenSSL library,
  * despite that library's more restrictive license.
diff --git a/src/util.c b/src/util.c
index d3c6804..09a1952 100644
--- a/src/util.c
+++ b/src/util.c
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * As a special exception, mbsync may be linked with the OpenSSL library,
  * despite that library's more restrictive license.