diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index 198d2f2..192821c 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -68,6 +68,25 @@ default_source_changed (GtkWidget *check_box,  ESource *source)
 		e_source_set_property (source, "default", NULL);
 }
 
+static GtkWidget *
+create_checkbox (const gchar *caption, gboolean active, GCallback cb, ESource *source)
+{
+	GtkWidget *widget;
+
+	g_return_val_if_fail (caption != NULL, NULL);
+	g_return_val_if_fail (cb != NULL, NULL);
+	g_return_val_if_fail (source != NULL, NULL);
+
+	widget = gtk_check_button_new_with_mnemonic (caption);
+
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), active);
+	gtk_widget_show (widget);
+
+	g_signal_connect (GTK_TOGGLE_BUTTON (widget), "toggled", cb, source);
+
+	return widget;
+}
+
 GtkWidget *
 org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
@@ -77,18 +96,53 @@ org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	if (data->old)
 		return data->old;
-	widget = gtk_check_button_new_with_mnemonic (_("Mark as _default address book"));
+
 	book_target = (EABConfigTargetSource *) data->target;
 	source = book_target->source;
 
-	if (e_source_get_property (source, "default"))
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+	widget = create_checkbox (_("Mark as _default address book"), e_source_get_property (source, "default") != NULL, G_CALLBACK (default_source_changed), source);
+
+	gtk_container_add (GTK_CONTAINER (data->parent), widget);
+
+	return widget;
+}
+
+static void
+use_in_contacts_calendar_changed (GtkWidget *check_box,  ESource *source)
+{
+	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_box)))
+		e_source_set_property (source, "use-in-contacts-calendar", "1");
 	else
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
+		e_source_set_property (source, "use-in-contacts-calendar", "0");
+}
+
+GtkWidget *org_gnome_book_cal_source (EPlugin *epl, EConfigHookItemFactoryData *data);
+
+GtkWidget *
+org_gnome_book_cal_source (EPlugin *epl, EConfigHookItemFactoryData *data)
+{
+	GtkWidget *widget;
+	ESource *source;
+	ESourceGroup *group;
+	EABConfigTargetSource *book_target;
+	const gchar *prop, *base_uri = NULL;
+
+	if (data->old)
+		return data->old;
+
+	book_target = (EABConfigTargetSource *) data->target;
+	source = book_target->source;
+
+	prop = e_source_get_property (source, "use-in-contacts-calendar");
+	group = e_source_peek_group (source);
+
+	if (group)
+		base_uri = e_source_group_peek_base_uri (group);
+
+	widget = create_checkbox (_("Use in _Birthday & Anniversaries calendar"), (prop && g_str_equal (prop, "1")) || (!prop && base_uri && g_str_has_prefix (base_uri, "file://")), G_CALLBACK (use_in_contacts_calendar_changed), source);
+
 	gtk_container_add (GTK_CONTAINER (data->parent), widget);
 
-	g_signal_connect (GTK_TOGGLE_BUTTON (widget), "toggled", G_CALLBACK (default_source_changed), source);
-	gtk_widget_show (widget);
 	return widget;
 }
 
diff --git a/plugins/default-source/org-gnome-default-source.eplug.xml b/plugins/default-source/org-gnome-default-source.eplug.xml
index 25bf09d..887fc57 100644
--- a/plugins/default-source/org-gnome-default-source.eplug.xml
+++ b/plugins/default-source/org-gnome-default-source.eplug.xml
@@ -29,6 +29,10 @@
 		 type="item"
 		 path="00.general/10.display/30.default"
 		 factory="org_gnome_default_book"/>
+
+                <item type="item"
+		 path="00.general/10.display/31.calsource"
+		 factory="org_gnome_book_cal_source"/>
 	</group>
         </hook>
 
