diff --git a/api/src/Framework.php b/api/src/Framework.php
index 73261beebe..9dfb6fa5f4 100644
--- a/api/src/Framework.php
+++ b/api/src/Framework.php
@@ -404,7 +404,7 @@ abstract class Framework extends Framework\Extra
 	{
 		$var = Array(
 			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images',
-			'version'        => $GLOBALS['egw_info']['server']['versions']['phpgwapi']
+			'version'        => $GLOBALS['egw_info']['server']['versions']['api']
 		);
 		$var['page_generation_time'] = '';
 		if($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
@@ -421,9 +421,13 @@ abstract class Framework extends Framework\Extra
 			}
 			$var['page_generation_time'] .= '</span></div>';
 		}
+		if (empty($GLOBALS['egw_info']['server']['versions']['maintenance_release']))
+		{
+			$GLOBALS['egw_info']['server']['versions']['maintenance_release'] = Api\Framework::api_version();
+		}
 		$var['powered_by'] = '<a href="http://www.egroupware.org/" target="_blank">'.
 			lang('Powered by').' EGroupware '.
-			$GLOBALS['egw_info']['server']['versions']['api'].'</a>';
+			$GLOBALS['egw_info']['server']['versions']['maintenance_release'].'</a>';
 
 		return $var;
 	}
diff --git a/api/src/Framework/About.php b/api/src/Framework/About.php
index 02710d9cc0..1bacf75785 100644
--- a/api/src/Framework/About.php
+++ b/api/src/Framework/About.php
@@ -112,8 +112,10 @@ EGroupware can be integrated easily into existing authentication solutions such
 
 		// fill content array for eTemplate
 		$changelog = null;
+		Api\Framework::api_version($changelog);
 		$content = array(
-			'apiVersion'	=> '<p>'.lang('EGroupware version').' <b>'.Api\Framework::api_version($changelog).'</b></p>',
+			'apiVersion'	=> '<p>'.lang('EGroupware version').
+				' <b>'.$GLOBALS['egw_info']['server']['versions']['maintenance_release'].'</b></p>',
 			'applications'	=> $apps,
 			'text_content'  => $text_content,
 			'changelog'     => file_exists($changelog) ? file_get_contents($changelog) : 'not available',
diff --git a/api/src/Framework/Updates.php b/api/src/Framework/Updates.php
index e8e6ddfa74..07b07f71ba 100644
--- a/api/src/Framework/Updates.php
+++ b/api/src/Framework/Updates.php
@@ -84,7 +84,7 @@ class Updates
 	 */
 	public static function notification()
 	{
-		$api = self::api_version();
+		$api = preg_replace('/ ?EPL$/', '', self::api_version());
 		$api_major = $matches = null;
 		if (preg_match('/^(\d+\.\d+)\./', $api, $matches))
 		{
diff --git a/setup/inc/class.setup_html.inc.php b/setup/inc/class.setup_html.inc.php
index 797c6df671..7956b81af6 100644
--- a/setup/inc/class.setup_html.inc.php
+++ b/setup/inc/class.setup_html.inc.php
@@ -158,7 +158,8 @@ class setup_html
 		}
 
 		$GLOBALS['setup_tpl']->set_var('lang_version',lang('version'));
-		if (!isset($GLOBALS['setup_info']) || !isset($GLOBALS['setup_info']['api']))
+		if (!isset($GLOBALS['setup_info']) || !isset($GLOBALS['setup_info']['api']) ||
+			!isset($GLOBALS['setup_info']['api']['versions']) || !isset($GLOBALS['setup_info']['api']['versions']['maintenance_release']))
 		{
 			include(EGW_SERVER_ROOT.'/api/setup/setup.inc.php');
 		}
@@ -166,7 +167,10 @@ class setup_html
 		{
 			$setup_info = $GLOBALS['setup_info'];
 		}
-		$GLOBALS['setup_tpl']->set_var('pgw_ver', $setup_info['api']['version']);
+		$GLOBALS['setup_tpl']->set_var('pgw_ver', $nologoutbutton ?
+			(double)$setup_info['api']['version'] :	// without login only show main version, not maintenance release
+			$setup_info['api']['versions']['maintenance_release']);
+
 		$GLOBALS['setup_tpl']->set_var(array(
 			'logoutbutton'  => $btn_logout,
 			'indexbutton'   => $index_btn,