diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index b4a247d4c89..7258e2e4eae 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -75,7 +75,7 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
 LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-LIBS += -lXUL
+LIBS += $(DIST)/bin/XUL
 else
 EXTRA_DSO_LIBS += xul
 endif
diff --git a/calendar/sunbird/app/Makefile.in b/calendar/sunbird/app/Makefile.in
index 8414304a1de..1bd502eeeff 100644
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -74,7 +74,7 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
 LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-LIBS += -lXUL
+LIBS += $(DIST)/bin/XUL
 else
 EXTRA_DSO_LIBS += xul
 endif
diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
index 1127d90b255..46ed2fe3c1f 100644
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -73,7 +73,7 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
 LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-LIBS += -lXUL
+LIBS += $(DIST)/bin/XUL
 else
 EXTRA_DSO_LIBS += xul
 endif
diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in
index 8ae1f31113c..7c97d90f66a 100644
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -90,10 +90,15 @@ LOCAL_INCLUDES += \
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 TK_LIBS := -framework Cocoa $(TK_LIBS)
-LIBS += -lXUL
+endif
+
+ifndef MOZ_ENABLE_LIBXUL
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+LIBS += $(DIST)/bin/XUL
 else
 EXTRA_DSO_LIBS += xul
 endif
+endif
 
 LIBS += \
 	$(EXTRA_DSO_LIBS) \