diff --git a/src/Makefile.am b/src/Makefile.am
index 0bc6a54b0..55a225caf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -234,6 +234,12 @@ NetworkManager_CPPFLAGS = \
 	-DNMLOCALEDIR=\"$(datadir)/locale\" \
 	-DARP_DEBUG
 
+
+WIMAX_LIBS=
+if WITH_WIMAX
+WIMAX_LIBS = ./wimax/libwimax.la
+endif
+
 NetworkManager_LDADD = \
 	$(top_builddir)/marshallers/libmarshallers.la \
 	./logging/libnm-logging.la \
@@ -246,6 +252,7 @@ NetworkManager_LDADD = \
 	./ppp-manager/libppp-manager.la \
 	./modem-manager/libmodem-manager.la \
 	./bluez-manager/libbluez-manager.la \
+	$(WIMAX_LIBS) \
 	./system-settings/libsystem-settings.la \
 	./backends/libnmbackend.la \
 	$(top_builddir)/libnm-util/libnm-util.la \
@@ -258,10 +265,6 @@ NetworkManager_LDADD = \
 	$(LIBM) \
 	$(LIBDL)
 
-if WITH_WIMAX
-NetworkManager_LDADD += ./wimax/libwimax.la
-endif
-
 NetworkManager_LDFLAGS = -rdynamic
 
 libexec_PROGRAMS = nm-crash-logger