--- gvpe/src/gvpe.C	2005/04/08 16:12:49	1.7
+++ gvpe/src/gvpe.C	2005/06/21 08:50:37	1.9
@@ -18,7 +18,7 @@
  
     You should have received a copy of the GNU General Public License
     along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "config.h"
@@ -92,7 +92,7 @@
                "  -L, --mlock                Lock tinc into main memory.\n"
                "      --help                 Display this help and exit.\n"
                "      --version              Output version information and exit.\n\n"));
-      printf (_("Report bugs to <vpe@plan9.de>.\n"));
+      printf (_("Report bugs to <gvpe@schmorp.de>.\n"));
     }
 
   exit (status);
@@ -222,11 +222,11 @@
 
   if (show_version)
     {
-      printf (_("%s version %s (built %s %s, protocol %d.%d)\n"), get_identity (),
+      printf (_("%s version %s (built %s %s, protocol version %d.%d)\n"), get_identity (),
               VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR);
       printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE);
       printf (_
-              ("Copyright (C) 2003 Marc Lehmann <vpe@plan9.de> and others.\n"
+              ("Copyright (C) 2003 Marc Lehmann <gvpe@schmorp.de> and others.\n"
                "See the AUTHORS file for a complete list.\n\n"
                "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
                "and you are welcome to redistribute it under certain conditions;\n"