--- Makefile.in.orig	2005-02-15 22:26:41.000000000 +0000
+++ Makefile.in	2005-07-30 04:43:00.000000000 +0000
@@ -30,6 +30,9 @@
 datadir=@datadir@
 LOCALEDIR=$(datadir)/locale
 
+LDFLAGS += \
+	-Wl,-R@GECKO_SDK_PREFIX@
+
 PIXMAPS=pixmaps/logo.xpm pixmaps/progress_left.xpm pixmaps/progress_right.xpm \
 	pixmaps/progress_fill.xpm pixmaps/progress_middle.xpm
 
--- configure.orig	2005-07-21 15:26:02.000000000 +0000
+++ configure	2005-07-30 22:41:18.000000000 +0000
@@ -2815,8 +2815,8 @@
 
 else
     echo "Using new (v1.7+) gecko-sdk"
-    MOZPLUG_CFLAGS="-I${GECKO_SDK_PREFIX} -I${GECKO_SDK_PREFIX}/include"
-    MOZPLUG_LIBS="-L ${GECKO_SDK_PREFIX}/lib -lxpcomglue -L ${GECKO_SDK_PREFIX}/bin -lnspr4 -lplds4"
+    MOZPLUG_CFLAGS="-I${GECKO_SDK_PREFIX}/include/nspr -I${GECKO_SDK_PREFIX}/include/plugin -I${GECKO_SDK_PREFIX}/include/java -I${GECKO_SDK_PREFIX}/include/xpcom"
+    MOZPLUG_LIBS="-L ${GECKO_SDK_PREFIX} -lxpcom -L ${GECKO_SDK_PREFIX} -lnspr4 -lplds4"
     GECKO_DEFINES="-DXPCOM_GLUE -DMOZILLA_STRICT_API"
 
 fi