diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog
index 96c5abc9e4..c08225cdda 100644
--- a/plugins/mail-notification/ChangeLog
+++ b/plugins/mail-notification/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use -no-undefined and link with GNOME_PLATFORM_LIBS
+	on Windows.
+
 2008-11-19  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* mail-notification.c: Fix compilation error.
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 80b4fbcc98..627fd93bed 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -1,3 +1,7 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = $(GNOME_PLATFORM_LIBS)
+endif
+
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	$(EVOLUTION_MAIL_CFLAGS)		\
@@ -16,8 +20,10 @@ plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
 
 liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
 liborg_gnome_mail_notification_la_LDFLAGS = 	\
-	-module -avoid-version			\
-	$(LIBNOTIFY_LIBS)			
+	-module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mail_notification_la_LIBADD = 	\
+	$(LIBNOTIFY_LIBS)			\
+	$(NO_UNDEFINED_REQUIRED_LIBS)
 
 if ENABLE_DBUS
 liborg_gnome_mail_notification_la_LDFLAGS += $(NMN_LIBS)