diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index ec7313e35ed1a0ce873ad01afe498b1cf9799ff3..a0917127c1fe7223d5a355599f07d4a59c90ad55 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -62,7 +62,7 @@ class SimpleSAML_Configuration {
 		$this->configuration = $config;
 	}
 
-	public function getVersion() {
+	public function getVersion($verbose = FALSE) {
 		return 'trunk';
 	}
 
diff --git a/templates/default/frontpage.php b/templates/default/frontpage.php
index 1824ef428f077f9f32737a6e1a9ca6e41b023146..dd0259dd6c7049a6478a01d8e8ab44b7ad4c7399 100644
--- a/templates/default/frontpage.php
+++ b/templates/default/frontpage.php
@@ -33,7 +33,9 @@ $icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/d
 		<p><?php echo $this->t('intro'); ?></p>
 		
 		<div>
-			<code style="background: white; border: 1px solid #ccc; padding: 1em; color: #555" ><?php echo $this->data['directory']; ?></code>
+			<code style="background: white; border: 1px solid #ccc; padding: 1em; color: #555" ><?php 
+				echo $this->data['directory'] . ' (' . $this->data['version'] . ')'; 
+			?></code>
 		</div>
 		
 		<h2><?php echo $this->t('useful_links_header'); ?></h2>
diff --git a/www/index.php b/www/index.php
index f8295edf37333a6df30828ba062e07222c30c652..93ff4078d115678f72b64fea5d46cd0d83e03e64 100644
--- a/www/index.php
+++ b/www/index.php
@@ -221,8 +221,6 @@ $funcmatrix[] = array(
 	'enabled' => $password_ok
 	);
 
-
-
 $t = new SimpleSAML_XHTML_Template($config, 'frontpage.php', 'frontpage');
 $t->data['header'] = 'simpleSAMLphp installation page';
 $t->data['icon'] = 'compass_l.png';
@@ -232,7 +230,7 @@ $t->data['links_meta'] = $linksmeta;
 $t->data['links_doc'] = $linksdoc;
 $t->data['enablematrix'] = $enablematrix;
 $t->data['funcmatrix'] = $funcmatrix;
-
+$t->data['version'] = $config->getVersion();
 $t->data['directory'] = dirname(dirname(__FILE__));
 
 $t->show();