diff --git a11y/Makefile.am a11y/Makefile.am
index 1f218dc..50f603f 100644
--- a11y/Makefile.am
+++ a11y/Makefile.am
@@ -14,7 +14,7 @@ libevolution_a11y_la_SOURCES =		\
 	gal-a11y-util.h			\
 	gal-a11y-factory.h
 
-libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_a11y_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libevolution_a11y_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la	\
diff --git addressbook/gui/contact-editor/Makefile.am addressbook/gui/contact-editor/Makefile.am
index 8f66bbf..c886bfc 100644
--- addressbook/gui/contact-editor/Makefile.am
+++ addressbook/gui/contact-editor/Makefile.am
@@ -28,7 +28,7 @@ libecontacteditor_la_SOURCES = 			\
 	e-contact-quick-add.c			\
 	e-contact-quick-add.h
 
-libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED)
+libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libecontacteditor_la_LIBADD =						\
 	$(top_builddir)/e-util/libeutil.la				\
diff --git addressbook/gui/contact-list-editor/Makefile.am addressbook/gui/contact-list-editor/Makefile.am
index f875f3c..9434ffb 100644
--- addressbook/gui/contact-list-editor/Makefile.am
+++ addressbook/gui/contact-list-editor/Makefile.am
@@ -23,7 +23,7 @@ libecontactlisteditor_la_SOURCES = 		\
 	e-contact-list-model.c			\
 	e-contact-list-model.h
 
-libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED)
+libecontactlisteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libecontactlisteditor_la_LIBADD =				\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
diff --git addressbook/importers/Makefile.am addressbook/importers/Makefile.am
index 7ccc4c7..9de0857 100644
--- addressbook/importers/Makefile.am
+++ addressbook/importers/Makefile.am
@@ -16,7 +16,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 = -avoid-version $(NO_UNDEFINED)
 
 libevolution_addressbook_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
diff --git addressbook/util/Makefile.am addressbook/util/Makefile.am
index 6338e22..3919db6 100644
--- addressbook/util/Makefile.am
+++ addressbook/util/Makefile.am
@@ -20,7 +20,7 @@ libeabutil_la_SOURCES =					\
 	eab-book-util.c					\
 	eab-book-util.h
 
-libeabutil_la_LDFLAGS = $(NO_UNDEFINED)
+libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libeabutil_la_LIBADD =					\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la \
diff --git calendar/gui/Makefile.am calendar/gui/Makefile.am
index 5c3f457..8a85495 100644
--- calendar/gui/Makefile.am
+++ calendar/gui/Makefile.am
@@ -229,7 +229,7 @@ libevolution_calendar_la_LIBADD =					\
 	$(EVOLUTION_CALENDAR_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)
 
-libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 @INTLTOOL_SERVER_RULE@
 
diff --git calendar/importers/Makefile.am calendar/importers/Makefile.am
index a5274b6..28e91e7 100644
--- calendar/importers/Makefile.am
+++ calendar/importers/Makefile.am
@@ -14,7 +14,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 = -avoid-version $(NO_UNDEFINED)
 
 libevolution_calendar_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
diff --git composer/Makefile.am composer/Makefile.am
index 108ab47..18d2f5e 100644
--- composer/Makefile.am
+++ composer/Makefile.am
@@ -53,7 +53,7 @@ libcomposer_la_SOURCES = 			\
 	e-composer-text-header.c		\
 	e-msg-composer.c
 
-libcomposer_la_LDFLAGS = $(NO_UNDEFINED)
+libcomposer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libcomposer_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git e-util/Makefile.am e-util/Makefile.am
index 8a15c52..262cf1c 100644
--- e-util/Makefile.am
+++ e-util/Makefile.am
@@ -135,7 +135,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 = 		\
 	$(ICONV_LIBS)		\
@@ -189,7 +189,7 @@ libeconduit_la_CPPFLAGS =							\
 
 libeconduit_la_SOURCES = $(pilot_compile)
 
-libeconduit_la_LDFLAGS = $(NO_UNDEFINED)
+libeconduit_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libeconduit_la_LIBADD = $(E_UTIL_LIBS) 	$(GNOME_PILOT_LIBS)
 
diff --git em-format/Makefile.am em-format/Makefile.am
index 212b45f..93deadd 100644
--- em-format/Makefile.am
+++ em-format/Makefile.am
@@ -20,7 +20,7 @@ libemformat_la_SOURCES =				\
 	em-format-quote.c				\
 	em-stripsig-filter.c
 
-libemformat_la_LDFLAGS = $(NO_UNDEFINED)
+libemformat_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libemformat_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git filter/Makefile.am filter/Makefile.am
index 3d7a864..beadfcc 100644
--- filter/Makefile.am
+++ filter/Makefile.am
@@ -53,7 +53,7 @@ libfilter_la_SOURCES =				\
 	e-rule-editor.c				\
 	e-rule-editor.h
 
-libfilter_la_LDFLAGS = $(NO_UNDEFINED)
+libfilter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libfilter_la_LIBADD = 				\
 	$(top_builddir)/e-util/libeutil.la	\
diff --git mail/Makefile.am mail/Makefile.am
index 2e6a69a..242c60b 100644
--- mail/Makefile.am
+++ mail/Makefile.am
@@ -177,7 +177,7 @@ libevolution_mail_la_LIBADD =				\
 	$(SMIME_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)
 
-libevolution_mail_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h

diff --git mail/importers/Makefile.am mail/importers/Makefile.am
index 5e1fdd5..148bb21 100644
--- mail/importers/Makefile.am
+++ mail/importers/Makefile.am
@@ -24,7 +24,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 = -avoid-version $(NO_UNDEFINED)
 
 libevolution_mail_importers_la_LIBADD =				\
 	$(WIN32_BOOTSTRAP_LIBS)					\
diff --git shell/Makefile.am shell/Makefile.am
index b941ee2..81f3408 100644
--- shell/Makefile.am
+++ shell/Makefile.am
@@ -81,7 +81,7 @@ libeshell_la_SOURCES =				\
 	e-shell-window-actions.c		\
 	es-event.c
 
-libeshell_la_LDFLAGS = $(NO_UNDEFINED)
+libeshell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libeshell_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git smclient/Makefile.am smclient/Makefile.am
index cbc004f..775eee0 100644
--- smclient/Makefile.am
+++ smclient/Makefile.am
@@ -22,8 +22,7 @@ libeggsmclient_la_LIBADD = \
 	$(EGG_SMCLIENT_LIBS) \
 	$(platform_libs)
 
-libeggsmclient_la_LDFLAGS = \
-	$(platform_ldflags)
+libeggsmclient_la_LDFLAGS = -avoid-version $(platform_ldflags)
 
 libeggsmclient_la_SOURCES = \
 	eggsmclient.c \
diff --git smime/gui/Makefile.am smime/gui/Makefile.am
index 2a28121..5caad2c 100644
--- smime/gui/Makefile.am
+++ smime/gui/Makefile.am
@@ -44,7 +44,7 @@ libevolution_smime_la_LIBADD =				\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(CERT_UI_LIBS)
 
-libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 ui_DATA = smime-ui.ui
 
diff --git smime/lib/Makefile.am smime/lib/Makefile.am
index a1db64a..0b7cf28 100644
--- smime/lib/Makefile.am
+++ smime/lib/Makefile.am
@@ -32,6 +32,6 @@ libessmime_la_LIBADD =				\
 	$(GNOME_PLATFORM_LIBS)			\
 	$(CERT_UI_LIBS)
 
-libessmime_la_LDFLAGS = $(NO_UNDEFINED)
+libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git widgets/e-timezone-dialog/Makefile.am widgets/e-timezone-dialog/Makefile.am
index fe5d468..a418e16 100644
--- widgets/e-timezone-dialog/Makefile.am
+++ widgets/e-timezone-dialog/Makefile.am
@@ -13,7 +13,7 @@ libetimezonedialog_la_SOURCES =	\
 	e-timezone-dialog.c	\
 	e-timezone-dialog.h
 
-libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED)
+libetimezonedialog_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libetimezonedialog_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git widgets/menus/Makefile.am widgets/menus/Makefile.am
index 3a33e64..dd4db79 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 = -avoid-version $(NO_UNDEFINED)
 
 libmenus_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git widgets/misc/Makefile.am widgets/misc/Makefile.am
index 5853039..6aedbc2 100644
--- widgets/misc/Makefile.am
+++ widgets/misc/Makefile.am
@@ -152,7 +152,7 @@ libemiscwidgets_la_SOURCES =			\
 	ea-cell-table.c				\
 	ea-widgets.c
 
-libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
+libemiscwidgets_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libemiscwidgets_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git widgets/table/Makefile.am widgets/table/Makefile.am
index b43e1f0..f0b0066 100644
--- widgets/table/Makefile.am
+++ widgets/table/Makefile.am
@@ -166,7 +166,7 @@ libetableinclude_HEADERS = 			\
 	gal-a11y-e-tree.h			\
 	gal-a11y-e-tree-factory.h
 
-libetable_la_LDFLAGS = $(NO_UNDEFINED)
+libetable_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libetable_la_LIBADD =					\
 	$(top_builddir)/a11y/libevolution-a11y.la	\
diff --git widgets/text/Makefile.am widgets/text/Makefile.am
index 4c53141..3ce5bc8 100644
--- widgets/text/Makefile.am
+++ widgets/text/Makefile.am
@@ -32,7 +32,7 @@ libetextinclude_HEADERS = 			\
 	gal-a11y-e-text-factory.h		\
 	gal-a11y-e-text.h
 
-libetext_la_LDFLAGS = $(NO_UNDEFINED)
+libetext_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libetext_la_LIBADD = 					\
 	$(top_builddir)/a11y/libevolution-a11y.la	\
