diff --git a/README b/README
index f10f6a35c..9e4ba911d 100644
--- a/README
+++ b/README
@@ -1,18 +1,19 @@
 
 Heimdal is an implementation of: ASN.1/DER, PKIX, and Kerberos.
 
-For information how to install see <http://www.h5l.org/compile.html>.
+For information how to install see
+<https://github.com/heimdal/heimdal/wiki/Building-and-installing>.
 
 There are briefer man pages for most of the commands.
 
-Bug reports and bugs are appreciated, see more under Bug reports in
-the manual on how we prefer them: <heimdal-bugs@h5l.org>.
+Bug reports and bugs are appreciated.  Use GitHub issues.
+<https://www.heimdal.software/heimdal/issues>.
 
 For more information see the web-page at
-<http://www.h5l.org/> or the mailing lists:
+<https://www.heimdal.software/heimdal/> or the mailing lists:
 
-heimdal-announce@sics.se	low-volume announcement
-heimdal-discuss@sics.se		high-volume discussion
+heimdal-announce@heimdal.software	low-volume announcement
+heimdal-discuss@heimdal.software	high-volume discussion
 
-send a mail to heimdal-announce-request@sics.se and
-heimdal-discuss-request@sics.se respectively to subscribe.
+send a mail to heimdal-announce-subscribe@heimdal.software and
+heimdal-discuss-subscribe@heimdal.software respectively to subscribe.
diff --git a/README.md b/README.md
index 63028814b..c06d34dd0 100644
--- a/README.md
+++ b/README.md
@@ -11,13 +11,21 @@ Heimdal is an implementation of:
  - PKIX, and
  - Kerberos.
 
-For information how to install see [here](http://www.h5l.org/compile.html).
+For information how to install see [here](https://github.com/heimdal/heimdal/wiki/Building-and-installing).
 
 There are man pages for most of the commands.
 
-Bug reports and bugs are appreciated.  Use GitHub issues.
+Bug reports and bugs are appreciated.  Use [GitHub issues](https://www.heimdal.software/heimdal/issues).
+
+For more information see the project homepage [https://heimdal.software/heimdal/](https://heimdal.software/heimdal/) or the mailing lists:
+
+  heimdal-announce@heimdal.software	low-volume announcement
+  heimdal-discuss@heimdal.software	high-volume discussion
+
+send mail to [heimdal-announce-subscribe@heimdal.software](mailto:heimdal-announce-subscribe@heimdal.software) and
+heimdal-discuss-subscribe@heimdal.software](mailto:heimdal-discuss-subscribe@heimdal.software)
+respectively to subscribe.
 
-For more information see the project homepage [https://heimdal.software/heimdal/](https://heimdal.software/heimdal/).
 
 Build Status
 ============