diff --git a/docs/simplesamlphp-sp.md b/docs/simplesamlphp-sp.md
index 089e3fc7747326e753a45860c509ed98cbf7f1d3..dd50adab9a7c5435d95b5b24e5a6e079c70287b1 100644
--- a/docs/simplesamlphp-sp.md
+++ b/docs/simplesamlphp-sp.md
@@ -139,10 +139,7 @@ The test page should contain a list of your attributes:
 ![Screenshot of the status page after a user has succesfully authenticated](resources/simplesamlphp-sp/screenshot-example.png)
 
 For a better looking, more advanced Discovery Service with tabs and live search, you may want to use the `discopower` module
-in SimpleSAMLphp. Take a look at the following blog entry for more information:
-
-  * [Blog entry about the DiscoPower module](https://rnd.feide.no/content/improved-discovery-service-live-search)
-
+contained in the SimpleSAMLphp distribution.
 
 Integrating authentication with your own application
 ----------------------------------------------------
diff --git a/lib/SimpleSAML/XHTML/IdPDisco.php b/lib/SimpleSAML/XHTML/IdPDisco.php
index e0c4405d2268c408d06eceec37244181922350dc..70b06d7172c5640e9d217e79d02e5ffcd401b73d 100644
--- a/lib/SimpleSAML/XHTML/IdPDisco.php
+++ b/lib/SimpleSAML/XHTML/IdPDisco.php
@@ -6,7 +6,7 @@
  * discovery service pages. This should reduce code duplication.
  *
  * Experimental support added for Extended IdP Metadata Discovery Protocol by Andreas 2008-08-28
- * More information: http://rnd.feide.no/content/extended-identity-provider-discovery-service-protocol
+ * More information: https://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-idp-discovery.pdf
  *
  * @author Jaime PĂ©rez <jaime.perez@uninett.no>, UNINETT AS.
  * @author Olav Morken, UNINETT AS.
diff --git a/modules/core/docs/authproc_languageadaptor.md b/modules/core/docs/authproc_languageadaptor.md
index d624b4dc0ee5cf70f3599b50da66ed74af03f345..1464b0540fd36905a3a5e485f065bd4d079d05f0 100644
--- a/modules/core/docs/authproc_languageadaptor.md
+++ b/modules/core/docs/authproc_languageadaptor.md
@@ -5,7 +5,7 @@ SimpleSAMLphp has built in language support, and stores the preferred language i
 
 Identity systems also often has a specific attribute that indicates what language is understood by the user.
 MACE defines an attribute with preferred language: `preferredLanguage`.
-[Read more about the preferredLanguage attribute defined by MACE](http://rnd.feide.no/node/1054).
+[Read more about the preferredLanguage attribute defined by MACE](https://tools.ietf.org/html/rfc2798#section-2.7).
 
 The LanguageAdaptor brings these two concepts together.
 If executed early at the IdP it will check if the `preferredLanguage` attribute is among the users attributes, and if it is, SimpleSAMLphp will use that language in the user interface.