diff -rN -u old-ion-3/build/ac/system-ac.mk.in new-ion-3/build/ac/system-ac.mk.in
--- old-ion-3/build/ac/system-ac.mk.in	2007-03-02 04:56:31.000000000 -0600
+++ new-ion-3/build/ac/system-ac.mk.in	2007-03-02 04:56:31.000000000 -0600
@@ -131,7 +131,8 @@
 	-Wparentheses -pedantic -Wuninitialized
 
 CFLAGS=@CFLAGS@ $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
-LDFLAGS=@LDFLAGS@ $(EXTRA_LIBS) $(LIBS)
+LDFLAGS=@LDFLAGS@
+LIBADD=$(EXTRA_LIBS) $(LIBS)
 EXPORT_DYNAMIC=-Xlinker --export-dynamic
 
 # The following options are mainly for development use and can be used
diff -rN -u old-ion-3/build/rules.mk new-ion-3/build/rules.mk
--- old-ion-3/build/rules.mk	2007-03-02 04:56:31.000000000 -0600
+++ new-ion-3/build/rules.mk	2007-03-02 04:56:31.000000000 -0600
@@ -84,7 +84,7 @@
 	$(CC) $(CC_PICFLAGS) $(CFLAGS) -c $< -o $@
 
 $(MODULE).so: $(OBJS) $(EXT_OBJS)
-	$(CC) $(LD_SHAREDFLAGS) $(LDFLAGS) $(OBJS) $(EXT_OBJS) -o $@
+	$(CC) $(LD_SHAREDFLAGS) $(LDFLAGS) $(OBJS) $(EXT_OBJS) $(LIBADD) -o $@
 
 
 module_install: module_stub_install
diff -rN -u old-ion-3/ion/Makefile new-ion-3/ion/Makefile
--- old-ion-3/ion/Makefile	2007-03-02 04:56:31.000000000 -0600
+++ new-ion-3/ion/Makefile	2007-03-02 04:56:31.000000000 -0600
@@ -51,7 +51,7 @@
 ######################################
 
 ion3: $(OBJS) $(EXT_OBJS)
-	$(CC) $(LINKOPTS) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@
+	$(CC) $(LINKOPTS) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) $(LIBADD) -o $@
 
 preload.c:
 	$(LUA) ../build/mkpreload.lua $(MODULE_LIST) > preload.c
diff -rN -u old-ion-3/mod_statusbar/ion-statusd/Makefile new-ion-3/mod_statusbar/ion-statusd/Makefile
--- old-ion-3/mod_statusbar/ion-statusd/Makefile	2007-03-02 04:56:31.000000000 -0600
+++ new-ion-3/mod_statusbar/ion-statusd/Makefile	2007-03-02 04:56:31.000000000 -0600
@@ -33,7 +33,7 @@
 ######################################
 
 ion-statusd: $(OBJS) $(EXT_OBJS)
-	$(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
+	$(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) $(LIBADD) -o $@
 
 _install: lc_install
 	$(INSTALLDIR) $(EXTRABINDIR)
diff -rN -u old-ion-3/pwm/Makefile new-ion-3/pwm/Makefile
--- old-ion-3/pwm/Makefile	2007-03-02 04:56:31.000000000 -0600
+++ new-ion-3/pwm/Makefile	2007-03-02 04:56:31.000000000 -0600
@@ -59,7 +59,7 @@
 ######################################
 
 pwm3: $(OBJS) $(EXT_OBJS)
-	$(CC) $(LINKOPTS) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@
+	$(CC) $(LINKOPTS) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) $(LIBADD) -o $@
 
 preload.c:
 	$(LUA) ../build/mkpreload.lua $(PWM_MODULE_LIST) > preload.c
diff -rN -u old-ion-3/system.mk new-ion-3/system.mk
--- old-ion-3/system.mk	2007-03-02 04:56:31.000000000 -0600
+++ new-ion-3/system.mk	2007-03-02 04:56:31.000000000 -0600
@@ -130,7 +130,8 @@
 	-Wparentheses -pedantic -Wuninitialized
 
 CFLAGS=-g -Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
-LDFLAGS=-g -Os $(EXTRA_LIBS) $(LIBS)
+LDFLAGS=-g -Os
+LIBADD=$(EXTRA_LIBS) $(LIBS)
 EXPORT_DYNAMIC=-Xlinker --export-dynamic
 
 # The following options are mainly for development use and can be used
diff -rN -u old-ion-3/utils/ion-completefile/Makefile new-ion-3/utils/ion-completefile/Makefile
--- old-ion-3/utils/ion-completefile/Makefile	2007-03-02 04:56:31.000000000 -0600
+++ new-ion-3/utils/ion-completefile/Makefile	2007-03-02 04:56:31.000000000 -0600
@@ -23,7 +23,7 @@
 ######################################
 
 ion-completefile: $(SOURCES)
-	$(CC) $< $(CFLAGS) $(LDFLAGS) -o $@
+	$(CC) $< $(CFLAGS) $(LDFLAGS) $(LIBADD) -o $@
 
 _install:
 	$(INSTALLDIR) $(EXTRABINDIR)