diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3b7d1ae020..255a4d1403 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-24  Hans Petter Jansson  <hpj@novell.com>
+
+	* Makefile.am (libevolution_mail_la_LIBADD): Pull in the contact
+	editors, so we can pass pointers to their creation functions to
+	ENameSelectorEntry.
+
 2005-01-24  JP Rosevear  <jpr@novell.com>
 
 	* searchtypes.xml: add back body contains
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 78ec9a2e39..78ce20e60f 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -197,6 +197,8 @@ libevolution_mail_la_LIBADD =					\
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/widgets/menus/libmenus.la		\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
+	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
+	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
 	$(SMIME_LIB)						\
 	$(EVOLUTION_MAIL_LIBS)