diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
index 9788963e3ef05cd638290e48576e4a5a96a46ab9..a220043b8254719f28863911947c343ebd497206 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
@@ -140,6 +140,8 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerFlatFile extends SimpleSAML_Meta
 			return $baseurl . 'shib13/idp/metadata.php';
 		} elseif($set === 'shib13-sp-hosted') {
 			return $baseurl . 'shib13/sp/metadata.php';
+		} elseif($set === 'wsfed-sp-hosted') {
+			return 'urn:federation:' . SimpleSAML_Utilities::getSelfHost();
 		} else {
 			throw new Exception('Can not generate dynamic EntityID for metadata of this type: [' . $set . ']');
 		}
diff --git a/metadata-templates/wsfed-sp-hosted.php b/metadata-templates/wsfed-sp-hosted.php
index 04b082ee6017470d7049574c4f7b3ad01be17cc5..238f33a13c0b8f91163b2b46e6c31eb5f5b19c29 100644
--- a/metadata-templates/wsfed-sp-hosted.php
+++ b/metadata-templates/wsfed-sp-hosted.php
@@ -1,9 +1,20 @@
 <?php
+/* 
+ * WS-Federation Meta data for simpleSAMLphp
+ *
+ * The WS-Federation SP Hosted config is used by the WS-Federation SP to identify itself.
+ *
+ * Required fields:
+ *  - host
+ */
 
 $metadata = array( 
-	'urn:federation:simplesamlphp:localhost' => array(
-		'host' => 'localhost',
-	),
+	/*
+	 * Example of a hosted SP 
+	 */
+	'__DYNAMIC:1__' => array(
+		'host'  => '__DEFAULT__'
+	)
 );
 
 ?>