diff --git a/bin/parseMetadata.php b/bin/parseMetadata.php
index 3a1b72da7b8cc5eb6d6b995df38fd344f1303b41..9a1b83a8d892a764e74bd20483be70b21ecd338d 100755
--- a/bin/parseMetadata.php
+++ b/bin/parseMetadata.php
@@ -168,7 +168,7 @@ function writeMetadataFiles() {
 
 		foreach($elements as $m) {
 			$filename = $m['filename'];
-			$entityID = $m['metadata']['entityID'];
+			$entityID = $m['metadata']['entityid'];
 
 			fwrite($fh, "\n");
 			fwrite($fh, '/* The following metadata was generated from ' . $filename . ' on ' . $GLOBALS['when'] . '. */' . "\n");
@@ -196,7 +196,7 @@ function dumpMetadataStdOut() {
 
 		foreach($elements as $m) {
 			$filename = $m['filename'];
-			$entityID = $m['metadata']['entityID'];
+			$entityID = $m['metadata']['entityid'];
 
 			echo("\n");
 			echo('/* The following metadata was generated from ' . $filename . ' on ' . $GLOBALS['when'] . '. */' . "\n");
diff --git a/docs/source/simplesamlphp-idp.xml b/docs/source/simplesamlphp-idp.xml
index 6e208fb22abdb6e9682499f8cfeb4fd4dca5bb51..963f2f73c7cbf268a6c07ceccd73767b5934db95 100644
--- a/docs/source/simplesamlphp-idp.xml
+++ b/docs/source/simplesamlphp-idp.xml
@@ -7,7 +7,7 @@
   <articleinfo>
     <date>2007-10-15</date>
 
-    <pubdate>Tue Mar 11 20:59:28 2008</pubdate>
+    <pubdate>Thu Mar 13 22:22:51 2008</pubdate>
 
     <author>
       <firstname>Andreas Ă…kre</firstname>
diff --git a/docs/source/simplesamlphp-sp.xml b/docs/source/simplesamlphp-sp.xml
index 11e8041b93c1a35d1ce05103b964299906a5a067..f48224c1964945993958defd05ad09e2bd53810b 100644
--- a/docs/source/simplesamlphp-sp.xml
+++ b/docs/source/simplesamlphp-sp.xml
@@ -7,7 +7,7 @@
   <articleinfo>
     <date>2007-10-15</date>
 
-    <pubdate>Tue Mar 11 21:00:41 2008</pubdate>
+    <pubdate>Thu Mar 13 22:23:40 2008</pubdate>
 
     <author>
       <firstname>Andreas Ă…kre</firstname>