diff --git a/mozilla/gfx/src/thebes/Makefile.in b/mozilla/gfx/src/thebes/Makefile.in
index ff11fe13851..50f2bb5e812 100644
--- a/mozilla/gfx/src/thebes/Makefile.in
+++ b/mozilla/gfx/src/thebes/Makefile.in
@@ -141,6 +141,10 @@ EXTRA_DSO_LDOPTS += \
 		$(TK_LIBS) \
 		$(NULL)
 
+ifdef MOZ_X11
+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS  += $(TK_CFLAGS)
diff --git a/mozilla/gfx/thebes/src/Makefile.in b/mozilla/gfx/thebes/src/Makefile.in
index 16794905452..6801c0f5b02 100644
--- a/mozilla/gfx/thebes/src/Makefile.in
+++ b/mozilla/gfx/thebes/src/Makefile.in
@@ -64,7 +64,7 @@ CPPSRCS +=      gfxXlibSurface.cpp gfxPlatformGtk.cpp gfxXlibNativeRenderer.cpp
 CPPSRCS +=	gfxPangoFonts.cpp 
 CPPSRCS +=	gfxPDFSurface.cpp gfxPSSurface.cpp
 CSRCS = cairo-xlib-utils.c
-EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS)
+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(MOZ_XFT_LIBS) $(XLDFLAGS) $(XLIBS)
 endif
 
 ifeq ($(MOZ_GFX_TOOLKIT),beos)
diff --git a/mozilla/toolkit/components/gnome/Makefile.in b/mozilla/toolkit/components/gnome/Makefile.in
index 2055f6ce2f0..c4eb5738e9a 100644
--- a/mozilla/toolkit/components/gnome/Makefile.in
+++ b/mozilla/toolkit/components/gnome/Makefile.in
@@ -74,9 +74,11 @@ CPPSRCS = \
 EXTRA_DSO_LDOPTS += \
 		$(XPCOM_GLUE_LDOPTS) \
 		$(XPCOM_FROZEN_LDOPTS) \
+		$(NSPR_LIBS) \
 		$(MOZ_GCONF_LIBS) \
 		$(MOZ_GNOMEVFS_LIBS) \
 		$(MOZ_LIBGNOME_LIBS) \
+		$(GLIB_LIBS) \
 		$(NULL)
 
 endif
@@ -87,5 +89,6 @@ CXXFLAGS += \
 	$(MOZ_GCONF_CFLAGS) \
 	$(MOZ_GNOMEVFS_CFLAGS) \
 	$(MOZ_LIBGNOME_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(NULL)