diff --git a11y/Makefile.am a11y/Makefile.am
index 72cd2c7..0178798 100644
--- a11y/Makefile.am
+++ a11y/Makefile.am
@@ -24,7 +24,7 @@ libevolution_a11y_la_SOURCES =		\
 	gal-a11y-util.h			\
 	gal-a11y-factory.h
 
-libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libevolution_a11y_la_LIBADD =			\
 	$(WIN32_BOOTSTRAP_LIBS)			\
diff --git a11y/addressbook/Makefile.am a11y/addressbook/Makefile.am
index 4d12760..5407495 100644
--- a11y/addressbook/Makefile.am
+++ a11y/addressbook/Makefile.am
@@ -26,7 +26,7 @@ libevolution_addressbook_a11y_la_SOURCES =	\
 	ea-addressbook.c			\
 	ea-addressbook.h
 
-libevolution_addressbook_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_addressbook_a11y_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libevolution_addressbook_a11y_la_LIBADD =	\
 	$(WIN32_BOOTSTRAP_LIBS)			\
diff --git a11y/calendar/Makefile.am a11y/calendar/Makefile.am
index 4605cb0..006ff6a 100644
--- a11y/calendar/Makefile.am
+++ a11y/calendar/Makefile.am
@@ -46,7 +46,7 @@ libevolution_calendar_a11y_la_SOURCES =		\
 	ea-gnome-calendar.c			\
 	ea-gnome-calendar.h
 
-libevolution_calendar_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_calendar_a11y_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libevolution_calendar_a11y_la_LIBADD =			\
 	$(WIN32_BOOTSTRAP_LIBS)				\
diff --git a11y/widgets/Makefile.am a11y/widgets/Makefile.am
index 663159c..e0a04f3 100644
--- a11y/widgets/Makefile.am
+++ a11y/widgets/Makefile.am
@@ -25,7 +25,7 @@ libevolution_widgets_a11y_la_SOURCES =		\
 	ea-widgets.c				\
 	ea-widgets.h
 
-libevolution_widgets_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_widgets_a11y_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libevolution_widgets_a11y_la_LIBADD =			\
 	$(WIN32_BOOTSTRAP_LIBS)				\
diff --git addressbook/gui/contact-editor/Makefile.am addressbook/gui/contact-editor/Makefile.am
index 36ba4c9..4042d33 100644
--- addressbook/gui/contact-editor/Makefile.am
+++ addressbook/gui/contact-editor/Makefile.am
@@ -27,7 +27,7 @@ libecontacteditor_la_SOURCES = 			\
 	e-contact-quick-add.c			\
 	e-contact-quick-add.h
 
-libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED)
+libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libecontacteditor_la_LIBADD =				\
 	$(WIN32_BOOTSTRAP_LIBS)				\
diff --git addressbook/gui/contact-list-editor/Makefile.am addressbook/gui/contact-list-editor/Makefile.am
index 81aa679..9b0f4a7 100644
--- addressbook/gui/contact-list-editor/Makefile.am
+++ addressbook/gui/contact-list-editor/Makefile.am
@@ -22,7 +22,7 @@ libecontactlisteditor_la_SOURCES = 		\
 	e-contact-list-model.c			\
 	e-contact-list-model.h
 
-libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED)
+libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libecontactlisteditor_la_LIBADD =						\
 	$(WIN32_BOOTSTRAP_LIBS)							\
diff --git addressbook/importers/Makefile.am addressbook/importers/Makefile.am
index 27c463b..b46e8ae 100644
--- addressbook/importers/Makefile.am
+++ addressbook/importers/Makefile.am
@@ -17,7 +17,7 @@ libevolution_addressbook_importers_la_SOURCES = \
 	evolution-csv-importer.c	        \
 	evolution-addressbook-importers.h
 
-libevolution_addressbook_importers_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_addressbook_importers_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libevolution_addressbook_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
diff --git addressbook/util/Makefile.am addressbook/util/Makefile.am
index 42f160e..04bb91e 100644
--- addressbook/util/Makefile.am
+++ addressbook/util/Makefile.am
@@ -15,7 +15,7 @@ libeabutil_la_SOURCES =					\
 	eab-book-util.c					\
 	eab-book-util.h
 
-libeabutil_la_LDFLAGS = $(NO_UNDEFINED)
+libeabutil_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libeabutil_la_LIBADD =					\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
diff --git calendar/gui/Makefile.am calendar/gui/Makefile.am
index 853cfce..908d27c 100644
--- calendar/gui/Makefile.am
+++ calendar/gui/Makefile.am
@@ -279,7 +279,7 @@ libevolution_cal_shared_la_LIBADD =					\
 	$(CAMEL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
-libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 
 libevolution_calendar_la_LIBADD =					\
diff --git calendar/importers/Makefile.am calendar/importers/Makefile.am
index 8fa711b..aafdd25 100644
--- calendar/importers/Makefile.am
+++ calendar/importers/Makefile.am
@@ -12,7 +12,7 @@ libevolution_calendar_importers_la_SOURCES = \
 	evolution-calendar-importer.h	     \
 	icalendar-importer.c
 
-libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libevolution_calendar_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
diff --git e-util/Makefile.am e-util/Makefile.am
index 35d254b..c595811 100644
--- e-util/Makefile.am
+++ e-util/Makefile.am
@@ -125,7 +125,7 @@ libeutil_la_SOURCES =				\
 MARSHAL_GENERATED = e-marshal.c e-marshal.h
 @EVO_MARSHAL_RULE@
 
-libeutil_la_LDFLAGS = $(NO_UNDEFINED)
+libeutil_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libeutil_la_LIBADD = 		\
 	$(WIN32_BOOTSTRAP_LIBS)	\
@@ -151,7 +151,7 @@ endif
 
 libeconduit_la_SOURCES = $(pilot_compile)
 
-libeconduit_la_LDFLAGS = $(NO_UNDEFINED)
+libeconduit_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libeconduit_la_LIBADD = $(E_UTIL_LIBS) 	$(GNOME_PILOT_LIBS)
 
diff --git filter/Makefile.am filter/Makefile.am
index ea996c8..268ff71 100644
--- filter/Makefile.am
+++ filter/Makefile.am
@@ -54,7 +54,7 @@ libfilter_la_SOURCES =				\
 	rule-editor.c				\
 	rule-editor.h
 
-libfilter_la_LDFLAGS = $(NO_UNDEFINED)
+libfilter_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libfilter_la_LIBADD = 				\
 	$(top_builddir)/e-util/libeutil.la	\
diff --git mail/Makefile.am mail/Makefile.am
index f8277aa..5236c2c 100644
--- mail/Makefile.am
+++ mail/Makefile.am
@@ -162,8 +162,7 @@ libevolution_mail_la_LIBADD =					\
 	$(REGEX_LIBS)						\
 	$(THREADS_LIBS)
 
-libevolution_mail_la_LDFLAGS = 			\
-	-avoid-version -module $(NO_UNDEFINED)
+libevolution_mail_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 libevolution_mail_la_DEPENDENCIES =		\
 	em-filter-i18n.h			\
@@ -252,7 +251,7 @@ libevolution_mail_shared_la_LIBADD =				\
 	$(EVOLUTION_MAIL_LIBS)					\
 	$(THREADS_LIBS)
 
-libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 # --- BIG NASTY AUTOMAKE HACK ---
 #
diff --git mail/importers/Makefile.am mail/importers/Makefile.am
index 5e46a54..d7e554b 100644
--- mail/importers/Makefile.am
+++ mail/importers/Makefile.am
@@ -21,7 +21,7 @@ libevolution_mail_importers_la_SOURCES =	\
 	pine-importer.c				\
 	evolution-mbox-importer.c
 
-libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libevolution_mail_importers_la_LIBADD =				\
 	$(WIN32_BOOTSTRAP_LIBS)					\
diff --git shell/Makefile.am shell/Makefile.am
index ecf0dc4..ddcf863 100644
--- shell/Makefile.am
+++ shell/Makefile.am
@@ -110,7 +110,7 @@ libeshell_la_SOURCES =				\
 	evolution-shell-component-utils.c	\
 	$(eshellinclude_HEADERS)
 
-libeshell_la_LDFLAGS = $(NO_UNDEFINED)
+libeshell_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libeshell_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git shell/test/Makefile.am shell/test/Makefile.am
index 8a2efd8..fb04a0f 100644
--- shell/test/Makefile.am
+++ shell/test/Makefile.am
@@ -15,8 +15,7 @@ libevolution_test_la_LIBADD =			\
 	$(top_builddir)/shell/libeshell.la	\
 	$(EVOLUTION_TEST_LIBS)
 
-libevolution_test_la_LDFLAGS =			\
-	-avoid-version -module $(NO_UNDEFINED)
+libevolution_test_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 testserver_in_files = GNOME_Evolution_Test.server.in.in
 testserver_DATA = $(testserver_in_files:.server.in.in=.server)
diff --git smime/gui/Makefile.am smime/gui/Makefile.am
index 16b907e..75efd0b 100644
--- smime/gui/Makefile.am
+++ smime/gui/Makefile.am
@@ -39,7 +39,7 @@ libevolution_smime_la_LIBADD =			\
 	$(top_builddir)/smime/lib/libessmime.la	\
 	$(CERT_UI_LIBS)
 
-libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 glade_DATA = smime-ui.glade
 
diff --git smime/lib/Makefile.am smime/lib/Makefile.am
index 8cd547a..9814133 100644
--- smime/lib/Makefile.am
+++ smime/lib/Makefile.am
@@ -31,6 +31,6 @@ libessmime_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(CERT_UI_LIBS)
 
-libessmime_la_LDFLAGS = $(NO_UNDEFINED)
+libessmime_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git widgets/e-timezone-dialog/Makefile.am widgets/e-timezone-dialog/Makefile.am
index cdc88e3..7619f93 100644
--- widgets/e-timezone-dialog/Makefile.am
+++ widgets/e-timezone-dialog/Makefile.am
@@ -12,7 +12,7 @@ libetimezonedialog_la_SOURCES =	\
 	e-timezone-dialog.c	\
 	e-timezone-dialog.h
 
-libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED)
+libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libetimezonedialog_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git widgets/menus/Makefile.am widgets/menus/Makefile.am
index f67a073..f2a17bd 100644
--- widgets/menus/Makefile.am
+++ widgets/menus/Makefile.am
@@ -40,7 +40,7 @@ libmenusinclude_HEADERS =			\
 	gal-view-new-dialog.h			\
 	gal-view.h
 
-libmenus_la_LDFLAGS = $(NO_UNDEFINED)
+libmenus_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libmenus_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git widgets/misc/Makefile.am widgets/misc/Makefile.am
index d6689ef..4196b44 100644
--- widgets/misc/Makefile.am
+++ widgets/misc/Makefile.am
@@ -142,8 +142,7 @@ libemiscwidgets_la_SOURCES =			\
 	e-unicode.c				\
 	e-colors.c
 
-
-libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
+libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/e-util/libeutil.la				\
@@ -162,7 +161,7 @@ libefilterbar_la_SOURCES =	\
 	e-filter-bar.c		\
 	$(filterbarinclude_HEADERS)
 
-libefilterbar_la_LDFLAGS = $(NO_UNDEFINED)
+libefilterbar_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libefilterbar_la_LIBADD =			\
 	$(WIN32_BOOTSTRAP_LIBS)			\
diff --git widgets/table/Makefile.am widgets/table/Makefile.am
index 4ae0861..0f79dab 100644
--- widgets/table/Makefile.am
+++ widgets/table/Makefile.am
@@ -141,7 +141,7 @@ libetableinclude_HEADERS = 			\
 	e-tree-table-adapter.h			\
 	e-tree.h
 
-libetable_la_LDFLAGS = $(NO_UNDEFINED)
+libetable_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libetable_la_LIBADD =					\
 	$(WIN32_BOOTSTRAP_LIBS)				\
diff --git widgets/text/Makefile.am widgets/text/Makefile.am
index ad10615..3d9443b 100644
--- widgets/text/Makefile.am
+++ widgets/text/Makefile.am
@@ -24,7 +24,7 @@ libetextinclude_HEADERS = 			\
 	e-text-model.h				\
 	e-text.h
 
-libetext_la_LDFLAGS = $(NO_UNDEFINED)
+libetext_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libetext_la_LIBADD = 					\
 	$(WIN32_BOOTSTRAP_LIBS)				\
