diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index fc2cb7c806..3ddf7ff710 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1168,6 +1168,19 @@ class calendar_boupdate extends calendar_bo
 		}
 		if ($updateTS) $GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, $event['id'] ? 'modify' : 'add', $this->now);
 
+		// create links for new participants from addressbook, if configured
+		if ($cal_id && $GLOBALS['egw_info']['server']['link_contacts'])
+		{
+			foreach($event['participants'] as $uid => $status)
+			{
+				calendar_so::split_user($uid, $user_type, $user_id);
+				if ($user_type == 'c' && (!$old_event || !isset($old_event['participants'][$uid])))
+				{
+					egw_link::link('calendar', $cal_id, 'addressbook', $user_id);
+				}
+			}
+		}
+
 		// Update history
 		$tracking = new calendar_tracking($this);
 		if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang
index 3ac291d266..54245f144e 100644
--- a/calendar/lang/egw_de.lang
+++ b/calendar/lang/egw_de.lang
@@ -100,6 +100,7 @@ create a new series	calendar	de	Neue Serie anlegen
 create an exception for the given date	calendar	de	Erzeugt eine Ausnahme am angegebenen Datum
 create an infolog from this event	calendar	de	Erstelle ein InfoLog von diesem Termin
 create exception	calendar	de	Ausnahme erzeugen
+create links for participants from addressbook	calendar	de	Erzeuge Verknüpfungen für Teilnehmer aus dem Adressbuch
 create new links	calendar	de	Neue Verknüpfung erstellen
 created	calendar	de	Angelegt
 creator	calendar	de	Ersteller
diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang
index 765f7bd422..f62c4a52d5 100644
--- a/calendar/lang/egw_en.lang
+++ b/calendar/lang/egw_en.lang
@@ -100,6 +100,7 @@ create a new series	calendar	en	Create a new series
 create an exception for the given date	calendar	en	Create an exception for the given date
 create an infolog from this event	calendar	en	Create an InfoLog from this event
 create exception	calendar	en	Create exception
+create links for participants from addressbook	calendar	en	Create links for participants from addressbook
 create new links	calendar	en	Create new links
 created	calendar	en	Created
 creator	calendar	en	Creator
diff --git a/calendar/templates/default/config.tpl b/calendar/templates/default/config.tpl
index 7dd8a491a2..4359e09ee8 100644
--- a/calendar/templates/default/config.tpl
+++ b/calendar/templates/default/config.tpl
@@ -119,6 +119,15 @@
     <td>&nbsp;{lang_Calendar_recurrence_horizont_in_days_(default_1000)}:</td>
     <td><input size="5" name="newsettings[calendar_horizont]" value="{value_calendar_horizont}"></td>
    </tr>
+   <tr class="row_off">
+    <td>&nbsp;{lang_Create_links_for_participants_from_addressbook}:</td>
+    <td>
+     <select name="newsettings[link_contacts]">
+      <option value="">{lang_No}</option>
+      <option value="yes"{selected_link_contacts_yes}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
 
 <!-- END body -->