diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index aaebcffb7e..b29f69d831 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -1923,7 +1923,9 @@ class calendar_bo
 							'month'     => $m,
 							'occurence' => 0,
 							'name'      => lang('Birthday').' '.($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']).' '.$pers['n_middle'].' '.
-								$pers['n_family'].($y && !$GLOBALS['egw_info']['server']['hide_birthdays'] ? ' ('.$y.')' : ''),
+								$pers['n_family'].
+								($GLOBALS['egw_info']['server']['hide_birthdays'] == 'age' ? ' '.($year - $y): '').
+								($y && in_array($GLOBALS['egw_info']['server']['hide_birthdays'], array('','age')) ? ' ('.$y.')' : ''),
 							'birthyear' => $y,	// this can be used to identify birthdays from holidays
 						);
 					}
diff --git a/calendar/templates/default/config.xet b/calendar/templates/default/config.xet
index e9a6492020..825fa7f17b 100644
--- a/calendar/templates/default/config.xet
+++ b/calendar/templates/default/config.xet
@@ -91,6 +91,7 @@
 					<select id="newsettings[hide_birthdays]">
 						<option value="">Yes</option>
 						<option value="dateonly">Show only the date, not the year</option>
+						<option value="age">Show year and age</option>
 						<option value="yes">No</option>
 					</select>
 				</row>