diff -urN epiphany-2.24.1/embed/mozilla/Makefile.am epiphany-2.24.1.new/embed/mozilla/Makefile.am
--- epiphany-2.24.1/embed/mozilla/Makefile.am	2008-06-30 20:01:36.000000000 +0200
+++ epiphany-2.24.1.new/embed/mozilla/Makefile.am	2008-10-23 14:49:51.000000000 +0200
@@ -120,6 +120,7 @@
 	cookie			\
 	docshell		\
 	dom			\
+	downloads		\
 	exthandler		\
 	fastfind		\
 	helperAppDlg		\
@@ -127,9 +128,11 @@
 	gfx			\
 	gtkembedmoz		\
 	history			\
+	intl			\
 	js			\
 	layout			\
 	locale			\
+	loginmgr		\
 	mimetype		\
 	necko			\
 	nkcache			\
@@ -141,6 +144,7 @@
 	string			\
 	sidebar			\
 	spellchecker		\
+	toolkitcomps		\
 	uriloader		\
 	uconv			\
 	wallet			\
@@ -150,7 +154,8 @@
 	windowwatcher		\
 	xmlextras		\
 	xpcom			\
-	xpconnect
+	xpconnect		\
+	xulapp
 
 libephymozillaembed_la_CPPFLAGS = \
 	-I$(top_srcdir)/lib	    		\
diff -urN epiphany-2.24.1/m4/gecko.m4 epiphany-2.24.1.new/m4/gecko.m4
--- epiphany-2.24.1/m4/gecko.m4	2008-03-28 16:02:48.000000000 +0100
+++ epiphany-2.24.1.new/m4/gecko.m4	2008-10-23 14:49:14.000000000 +0200
@@ -116,7 +116,7 @@
 	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
 	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
 else
-	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
+	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`"
 	_GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --cflags ${gecko_cv_gecko}-unstable`"
 	_GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
 	_GECKO_HOME=$with_gecko_home