diff --git a/config-templates/config.php b/config-templates/config.php
index 41b185a50417c8c5aa4097284394b748b2f220ad..8d871e9f2cd57b6651f3b9e9f6ce63f8407d2f15 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -37,8 +37,7 @@ $config = array (
 	 */
 	'tempdir'               => '/tmp/simplesaml',
 	
-	'version'				=>	'trunk',
-	
+
 	/**
 	 * If you set the debug parameter to true, all SAML messages will be visible in the
 	 * browser, and require the user to click the submit button. If debug is set to false,
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index 99e16c82b37c4479f0d67de07d1ce80907c58f3a..f3d8822abecdcd572ad7b7c5aefdc3ecf718c8b0 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -625,7 +625,7 @@ class SimpleSAML_Utilities {
 		
 		$t->data['trackid'] = $trackid;
 		
-		$t->data['version'] = $config->getString('version', 'na');
+		$t->data['version'] = $config->getVersion();
 		$t->data['url'] = self::selfURLNoQuery();
 		
 		$t->show();