diff -Naur courier-0.73.2.20140911-vanilla/courier/module.esmtp/Makefile.am courier-0.73.2.20140911/courier/module.esmtp/Makefile.am
--- courier-0.73.2.20140911-vanilla/courier/module.esmtp/Makefile.am	2014-09-18 10:23:10.185497520 +0200
+++ courier-0.73.2.20140911/courier/module.esmtp/Makefile.am	2014-09-18 10:23:28.515504964 +0200
@@ -93,9 +93,9 @@
 
 courieresmtpd_DEPENDENCIES=$(courieresmtp_DEPENDENCIES) \
 				../../libs/tcpd/libspipe.la
-courieresmtpd_LDADD=$(commonLDADD) ../../libs/tcpd/libspipe.la
-courieresmtpd_LDFLAGS=`@COURIERAUTHCONFIG@ --ldflags` \
-		-lcourierauthsasl -lcourierauth
+courieresmtpd_LDADD=$(commonLDADD) ../../libs/tcpd/libspipe.la \
+			-lcourierauthsasl -lcourierauth
+courieresmtpd_LDFLAGS=`@COURIERAUTHCONFIG@ --ldflags`
 
 addcr_SOURCES=addcr.c
 
diff -Naur courier-0.73.2.20140911-vanilla/courier/module.esmtp/Makefile.in courier-0.73.2.20140911/courier/module.esmtp/Makefile.in
--- courier-0.73.2.20140911-vanilla/courier/module.esmtp/Makefile.in	2014-09-18 10:23:10.185497520 +0200
+++ courier-0.73.2.20140911/courier/module.esmtp/Makefile.in	2014-09-18 10:23:28.515504964 +0200
@@ -462,9 +462,9 @@
 courieresmtpd_DEPENDENCIES = $(courieresmtp_DEPENDENCIES) \
 				../../libs/tcpd/libspipe.la
 
-courieresmtpd_LDADD = $(commonLDADD) ../../libs/tcpd/libspipe.la
-courieresmtpd_LDFLAGS = `@COURIERAUTHCONFIG@ --ldflags` \
-		-lcourierauthsasl -lcourierauth
+courieresmtpd_LDADD = $(commonLDADD) ../../libs/tcpd/libspipe.la \
+			-lcourierauthsasl -lcourierauth
+courieresmtpd_LDFLAGS = `@COURIERAUTHCONFIG@ --ldflags`
 
 addcr_SOURCES = addcr.c
 librewrite_la_SOURCES = esmtp.c
diff -Naur courier-0.73.2.20140911-vanilla/libs/gpglib/Makefile.in courier-0.73.2.20140911/libs/gpglib/Makefile.in
--- courier-0.73.2.20140911-vanilla/libs/gpglib/Makefile.in	2014-09-18 10:23:10.245497543 +0200
+++ courier-0.73.2.20140911/libs/gpglib/Makefile.in	2014-09-18 10:23:22.385502476 +0200
@@ -333,9 +333,9 @@
 	sign.c tempname.c tempname.h
 
 testgpg_SOURCES = testgpg.c
-testgpg_LDADD = libgpg.la ../numlib/libnumlib.la
+testgpg_LDADD = libgpg.la ../numlib/libnumlib.la -lunicode
 testgpg_DEPENDENCIES = $(testgpg_LDADD)
-testgpg_LDFLAGS = -static -lunicode
+testgpg_LDFLAGS = -static
 mimegpg_SOURCES = mimegpg.c
 mimegpg_LDADD = libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la \
 		../rfc822/libencode.la ../numlib/libnumlib.la \
diff -Naur courier-0.73.2.20140911-vanilla/libs/rfc2045/Makefile.am courier-0.73.2.20140911/libs/rfc2045/Makefile.am
--- courier-0.73.2.20140911-vanilla/libs/rfc2045/Makefile.am	2014-09-18 10:23:10.225497535 +0200
+++ courier-0.73.2.20140911/libs/rfc2045/Makefile.am	2014-09-18 10:23:22.385502476 +0200
@@ -31,24 +31,23 @@
 
 reformime_SOURCES=reformime.c
 reformime_LDADD = librfc2045.la ../rfc822/libencode.la ../rfc822/librfc822.la \
-		../numlib/libnumlib.la
+		../numlib/libnumlib.la -lunicode
 reformime_DEPENDENCIES = $(reformime_LDADD)
-reformime_LDFLAGS=-static -lunicode
+reformime_LDFLAGS=-static
 
 makemime_SOURCES=makemime.c
-makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la
+makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la -lunicode
 makemime_DEPENDENCIES=$(makemime_LDADD)
-makemime_LDFLAGS=-static -lunicode
+makemime_LDFLAGS=-static
 
 headercheck_SOURCES=headercheck.c
-headercheck_LDADD=librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la
+headercheck_LDADD=librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la -lunicode
 headercheck_DEPENDENCIES=$(headercheck_LDADD)
-headercheck_LDFLAGS=-static -lunicode
+headercheck_LDFLAGS=-static
 
 testrfc3676parser_SOURCES=testrfc3676parser.c
-testrfc3676parser_LDADD=librfc2045.la
+testrfc3676parser_LDADD=librfc2045.la -lunicode
 testrfc3676parser_DEPENDENCIES=$(testrfc3676parser_LDADD)
-testrfc3676parser_LDFLAGS=-lunicode
 
 if HAVE_SGML
 reformime.html: reformime.sgml ../docbook/sgml2html
diff -Naur courier-0.73.2.20140911-vanilla/libs/rfc2045/Makefile.in courier-0.73.2.20140911/libs/rfc2045/Makefile.in
--- courier-0.73.2.20140911-vanilla/libs/rfc2045/Makefile.in	2014-09-18 10:23:10.225497535 +0200
+++ courier-0.73.2.20140911/libs/rfc2045/Makefile.in	2014-09-18 10:23:22.385502476 +0200
@@ -395,22 +395,21 @@
 
 reformime_SOURCES = reformime.c
 reformime_LDADD = librfc2045.la ../rfc822/libencode.la ../rfc822/librfc822.la \
-		../numlib/libnumlib.la
+		../numlib/libnumlib.la -lunicode
 
 reformime_DEPENDENCIES = $(reformime_LDADD)
-reformime_LDFLAGS = -static -lunicode
+reformime_LDFLAGS = -static
 makemime_SOURCES = makemime.c
-makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la
+makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la -lunicode
 makemime_DEPENDENCIES = $(makemime_LDADD)
-makemime_LDFLAGS = -static -lunicode
+makemime_LDFLAGS = -static
 headercheck_SOURCES = headercheck.c
-headercheck_LDADD = librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la
+headercheck_LDADD = librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la -lunicode
 headercheck_DEPENDENCIES = $(headercheck_LDADD)
-headercheck_LDFLAGS = -static -lunicode
+headercheck_LDFLAGS = -static
 testrfc3676parser_SOURCES = testrfc3676parser.c
-testrfc3676parser_LDADD = librfc2045.la
+testrfc3676parser_LDADD = librfc2045.la -lunicode
 testrfc3676parser_DEPENDENCIES = $(testrfc3676parser_LDADD)
-testrfc3676parser_LDFLAGS = -lunicode
 @HAVE_LIBIDN_FALSE@TESTSUITE = testsuite.txt.noidn
 @HAVE_LIBIDN_TRUE@TESTSUITE = testsuite.txt.idn
 all: $(BUILT_SOURCES) rfc2045_config.h