diff --git a/composer.json b/composer.json
index 63ea892ef96546de17da9af350f918269cb67259..cc805567a6e0df8702953bf670c53315e4d277f8 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
     },
     "require": {
         "php": ">=5.3",
-        "simplesamlphp/saml2": "~1.6.1",
+        "simplesamlphp/saml2": "~1.7",
         "robrichards/xmlseclibs": "~1.4.1",
         "whitehat101/apr1-md5": "~1.0"
     },
diff --git a/composer.lock b/composer.lock
index e0b80cab9a887277fafd6550729e70dc52a426db..7edbe6ceddbe9e0d48f4783cb9a3ef6ddc7857ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "71490cffa1b80de46763a342a15b55af",
-    "content-hash": "1adf316fa698b60b8e8563dca982f107",
+    "hash": "b4170f6ef1aa19cf7299c56a91332fff",
+    "content-hash": "37c3a3afccac2b94a358d00516a2a3a8",
     "packages": [
         {
             "name": "psr/log",
@@ -88,21 +88,20 @@
         },
         {
             "name": "simplesamlphp/saml2",
-            "version": "v1.6.1",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/simplesamlphp/saml2.git",
-                "reference": "da4f356dfee6eaabac4fb8afb0de045e571c476b"
+                "reference": "f89856e2afe6ab6758c7f34c1fbe4ed8c952a623"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/da4f356dfee6eaabac4fb8afb0de045e571c476b",
-                "reference": "da4f356dfee6eaabac4fb8afb0de045e571c476b",
+                "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/f89856e2afe6ab6758c7f34c1fbe4ed8c952a623",
+                "reference": "f89856e2afe6ab6758c7f34c1fbe4ed8c952a623",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
-                "ext-mcrypt": "*",
                 "ext-openssl": "*",
                 "php": ">=5.3.3",
                 "psr/log": "~1.0",
@@ -134,7 +133,7 @@
                 }
             ],
             "description": "SAML2 PHP library from SimpleSAMLphp",
-            "time": "2015-07-13 10:00:26"
+            "time": "2015-10-06 09:55:13"
         },
         {
             "name": "whitehat101/apr1-md5",
diff --git a/www/_include.php b/www/_include.php
index 7b65e92dccc880bbe7fdc761d9f05361dc88b774..9127d461b7e2628da2546ec2439ed1c3f1bb7396 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -91,6 +91,3 @@ if (!file_exists($configdir.'/config.php')) {
 
 // set the timezone
 SimpleSAML\Utils\Time::initTimezone();
-
-// disable XML external entity loading explicitly
-libxml_disable_entity_loader();