diff -Naur bluez-4.31.orig/common/Makefile.am bluez-4.31/common/Makefile.am
--- bluez-4.31.orig/common/Makefile.am	2009-02-27 22:57:29.515330134 +0100
+++ bluez-4.31/common/Makefile.am	2009-02-27 22:58:11.249328307 +0100
@@ -4,6 +4,8 @@
 libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c logging.h logging.c \
 		glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c btio.h btio.c
 
+libhelper_a_LIBADD = @BLUEZ_LIBS@
+
 noinst_PROGRAMS = test_textfile
 
 test_textfile_LDADD = libhelper.a
diff -Naur bluez-4.31.orig/test/Makefile.am bluez-4.31/test/Makefile.am
--- bluez-4.31.orig/test/Makefile.am	2009-02-27 22:57:29.518659538 +0100
+++ bluez-4.31/test/Makefile.am	2009-02-27 23:07:09.294597176 +0100
@@ -23,13 +23,13 @@
 
 bdaddr_SOURCES = bdaddr.c
 
-bdaddr_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
+bdaddr_LDADD = $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@
 
 lmptest_LDADD = @BLUEZ_LIBS@
 
 agent_LDADD = @DBUS_LIBS@
 
-btiotest_LDADD = @GLIB_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
+btiotest_LDADD = @GLIB_LIBS@ $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@
 
 noinst_MANS = bdaddr.8