diff --git a/src/XML/element.registry.php b/src/XML/element.registry.php
index 12d3e1c1..ba634faf 100644
--- a/src/XML/element.registry.php
+++ b/src/XML/element.registry.php
@@ -7,7 +7,7 @@
         'CanonicalizationMethod' => '\SimpleSAML\XMLSecurity\XML\ds\CanonicalizationMethod',
         'DigestMethod' => '\SimpleSAML\XMLSecurity\XML\ds\DigestMethod',
         'DigestValue' => '\SimpleSAML\XMLSecurity\XML\ds\DigestValue',
-//        'DSAKeyValue' => '\SimpleSAML\XMLSecurity\XML\ds\DSAKeyValue',
+        'DSAKeyValue' => '\SimpleSAML\XMLSecurity\XML\ds\DSAKeyValue',
         'KeyInfo' => '\SimpleSAML\XMLSecurity\XML\ds\KeyInfo',
         'KeyName' => '\SimpleSAML\XMLSecurity\XML\ds\KeyName',
         'KeyValue' => '\SimpleSAML\XMLSecurity\XML\ds\KeyValue',
@@ -24,7 +24,7 @@
         'SignatureProperty' => '\SimpleSAML\XMLSecurity\XML\ds\SignatureProperty',
         'SignatureValue' => '\SimpleSAML\XMLSecurity\XML\ds\SignatureValue',
         'SignedInfo' => '\SimpleSAML\XMLSecurity\XML\ds\SignedInfo',
-//        'SPKIData' => '\SimpleSAML\XMLSecurity\XML\ds\SPKIData',
+        'SPKIData' => '\SimpleSAML\XMLSecurity\XML\ds\SPKIData',
         'Transform' => '\SimpleSAML\XMLSecurity\XML\ds\Transform',
         'Transforms' => '\SimpleSAML\XMLSecurity\XML\ds\Transforms',
         'X509Data' => '\SimpleSAML\XMLSecurity\XML\ds\X509Data',
@@ -53,4 +53,11 @@
         'EncryptionProperty' => '\SimpleSAML\XMLSecurity\XML\xenc\EncryptionProperty',
         'ReferenceList' => '\SimpleSAML\XMLSecurity\XML\xenc\ReferenceList',
     ],
+    'http://www.w3.org/2009/xmlenc11#'=> [
+        'ConcatKDFParams' => '\SimpleSAML\XMLSecurity\XML\xenc11\ConcatKDFParams',
+        'DerivedKey' => '\SimpleSAML\XMLSecurity\XML\xenc11\DerivedKey',
+        'KeyDerivationMethod' => '\SimpleSAML\XMLSecurity\XML\xenc11\KeyDerivationMethod',
+        'PBKDF2-params' => '\SimpleSAML\XMLSecurity\XML\xenc11\PBKDF2params',
+        'MGF' => '\SimpleSAML\XMLSecurity\XML\xenc11\MGF',
+    ],
 ];