diff --git a/HACKING b/HACKING
index 6a99471e3..eb544b904 100644
--- a/HACKING
+++ b/HACKING
@@ -35,7 +35,7 @@ dev@nmap.org .  This is a good way to solicit feedback on
 your proposals.  List members are often very willing to help.  You
 might want to subscribe to that mailing list as well -- send a blank
 email to dev-subscribe@nmap.org .  While you are at it, you
-might also want to subscribe to nmap-hackers via the same mechanism.
+might also want to subscribe to announce@nmap.org via the same mechanism.
 Web archives of those lists are at http://seclists.org .
 
 Some ideas of useful contributions/projects
diff --git a/docs/refguide.xml b/docs/refguide.xml
index f7f6e1775..804f6d3b1 100644
--- a/docs/refguide.xml
+++ b/docs/refguide.xml
@@ -1623,7 +1623,8 @@ requests for such functionality.  Then in the summer of 2000,
 Gerhard Rieger<indexterm><primary>Rieger, Gerhard</primary></indexterm>
 conceived the idea, wrote an excellent patch implementing it,
 and sent it to the
-<citetitle>nmap-hackers</citetitle> mailing list.<indexterm><primary><citetitle>nmap-hackers</citetitle> mailing list</primary></indexterm>
+<citetitle>announce</citetitle> mailing list<indexterm><primary><citetitle>announce</citetitle> mailing list</primary></indexterm>
+(then called <citetitle>nmap-hackers</citetitle>).<indexterm><primary><citetitle>nmap-hackers</citetitle> mailing list</primary><see><citetitle>announce</citetitle> mailing list</indexterm>
 I incorporated that patch into the Nmap tree and released a new
 version the next day.  Few pieces of commercial software have users
 enthusiastic enough to design and contribute their own
diff --git a/nping/docs/AUTHORS b/nping/docs/AUTHORS
index faf47124c..cef394b90 100644
--- a/nping/docs/AUTHORS
+++ b/nping/docs/AUTHORS
@@ -9,7 +9,7 @@ Further development was done in the Google Summer of Code 2010 by Luis
 once again mentored by Fyodor. 
 
 Many helpful comments, suggestions and other useful information were taken from 
-the nmap-dev list (@insecure.org) as well as other contributors via email.
+the dev@nmap.org list as well as other contributors via email.
 
 Nping shares the Nmap infrastructure libraries (Nsock and Nbase) which were
 originally written by Fyodor.