diff --git a/Makefile.am b/Makefile.am
index 4ca421c54..a19bf0895 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = include/ircd
 SUBDIRS += ircd
-SUBDIRS += charybdis
 SUBDIRS += modules
+SUBDIRS += charybdis
 SUBDIRS += tools
 SUBDIRS += help
 SUBDIRS += doc
diff --git a/ircd/Makefile.am b/ircd/Makefile.am
index 5406e6c7a..66c285968 100644
--- a/ircd/Makefile.am
+++ b/ircd/Makefile.am
@@ -20,9 +20,9 @@ AM_LDFLAGS = \
 	-Wl,--no-allow-shlib-undefined \
 	-Wl,--export-dynamic \
 	-Wl,--no-gnu-unique \
-	-Wl,--no-allow-shlib-undefined
-#	-Wl,--no-undefined
+	-Wl,--no-allow-shlib-undefined \
 	$(PLATFORM_LDFLAGS)
+#	-Wl,--no-undefined
 
 libircd_LTLIBRARIES = libircd.la
 
diff --git a/modules/Makefile.am b/modules/Makefile.am
index ce797b17b..f419071a6 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -17,7 +17,8 @@ AM_LDFLAGS += \
 	-Wl,--shared \
 	-Wl,--export-dynamic \
 	-Wl,--no-gnu-unique \
-	-Wl,--no-allow-shlib-undefined
+	-Wl,--no-allow-shlib-undefined \
+	$(PLATFORM_LDFLAGS)
 #	-Wl,--no-undefined
 #	-export-symbols-regex IRCD_MODULE*
 #	-export-symbols-regex *