diff --git a/README.md b/README.md
index 4b5c911..861b735 100644
--- a/README.md
+++ b/README.md
@@ -371,13 +371,14 @@ SEE ALSO
      for information on Cisco implementation of ASN32.
 4. [JunOS prefix-lists limitation](http://www.juniper.net/techpubs/en_US/junos11.4/topics/reference/configuration-statement/prefix-list-edit-policy-options.html)
 
-AUTHOR
-------
+AUTHORS
+-------
 
+Job Snijders [job@ntt.net](mailto:job@ntt.net)
 Alexandre Snarskii [snar@snar.spb.ru](mailto:snar@snar.spb.ru)
 
 Program Homepage
 ----------------
 
-[http://snar.spb.ru/prog/bgpq4/](http://snar.spb.ru/prog/bgpq4/)
+[https://github.com/bgp/bgpq4](https://github.com/bgp/bgpq4)
 
diff --git a/bgpq4.8 b/bgpq4.8
index 56c9be3..203a312 100644
--- a/bgpq4.8
+++ b/bgpq4.8
@@ -298,5 +298,6 @@ Routing Arbiter project
 for information on 'asdot' and 'asplain' notations. 
 .Sy http://www.cisco.com/en/US/docs/ios/12_0s/release/ntes/120SNEWF.html#wp3521658
 for information on Cisco implementation of ASN32. 
-.Sh AUTHOR
+.Sh AUTHORS
+.An Job Snijders Aq job@ntt.net
 .An Alexandre Snarskii Aq snar@snar.spb.ru
diff --git a/configure b/configure
index 8533193..f24e99c 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for bgpq4 0.1.35.
 #
-# Report bugs to <snar@snar.spb.ru>.
+# Report bugs to job@ntt.net
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -1306,7 +1306,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <snar@snar.spb.ru>.
+Report bugs to <job@ntt.net>.
 _ACEOF
 ac_status=$?
 fi