diff --git a/addressbook/help/index.php b/addressbook/help/index.php
index 92cbee0f44..9d060b29b9 100755
--- a/addressbook/help/index.php
+++ b/addressbook/help/index.php
@@ -17,10 +17,10 @@
 	$phpgw_info['flags'] = $phpgw_flags;
 	include('../../header.inc.php');
 	$appname = 'addressbook';
-	include(PHPGW_SERVER_ROOT.'/'.$appname.'/version.inc.php');
+	include(PHPGW_SERVER_ROOT.'/'.$appname.'/setup/setup.inc.php');
 ?>
 <img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>" border="0"><p/>
 <font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
-Version: <b><?php echo $phpgw_info['server']['versions'][$appname]; ?></b>
+Version: <b><?php echo $setup_info[$appname]['version']; ?></b>
 </font>
 <?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/index.php b/admin/help/index.php
index 02b2bc8355..cb180ca5dd 100755
--- a/admin/help/index.php
+++ b/admin/help/index.php
@@ -18,10 +18,10 @@
 	$phpgw_info['flags'] = $phpgw_flags;
 	include('../../header.inc.php');
 	$appname = 'admin';
-	include(PHPGW_SERVER_ROOT.'/'.$appname.'/version.inc.php');
+	include(PHPGW_SERVER_ROOT.'/'.$appname.'/setup/setup.inc.php');
 ?>
 <img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>" border="0"><p/>
 <font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
-Version: <b><?php echo $phpgw_info['server']['versions'][$appname]; ?></b>
+Version: <b><?php echo $setup_info[$appname]['version']; ?></b>
 </font>
 <?php $phpgw->common->phpgw_footer(); ?>
diff --git a/calendar/help/index.php b/calendar/help/index.php
index 34a689a1e6..295defa14d 100755
--- a/calendar/help/index.php
+++ b/calendar/help/index.php
@@ -17,11 +17,11 @@
 	$phpgw_info['flags'] = $phpgw_flags;
 	include('../../header.inc.php');
 	$appname = 'calendar';
-	include(PHPGW_SERVER_ROOT.'/'.$appname.'/version.inc.php');
+	include(PHPGW_SERVER_ROOT.'/'.$appname.'/setup/setup.inc.php');
 ?>
 <img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>" border="0"><p/>
 <font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
-Version: <b><?php echo $phpgw_info['server']['versions'][$appname]; ?></b><p/>
+Version: <b><?php echo $setup_info[$appname]['version']; ?></b><p/>
 This app was based on <a href="http://webcalendar.sourceforge.net" target="_new">WebCalendar</a><br/><p/>
 Transformed by <a href="<?php echo $phpgw->link('/email/compose.php','to=skeeter@phpgroupware.org'); ?>" target="_new">Mark A Peters (Skeeter)</a><br/>
 </font>