diff --git a/xulrunner/.footprint b/xulrunner/.footprint
index c787b2365..2f74a4324 100644
--- a/xulrunner/.footprint
+++ b/xulrunner/.footprint
@@ -374,16 +374,6 @@ drwxr-xr-x	root/root	usr/include/xulrunner-1.9/unstable/
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/base64.h
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/blapit.h
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/bool.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cairo-deprecated.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cairo-features.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cairo-ft.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cairo-pdf.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cairo-platform.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cairo-ps.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cairo-rename.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cairo-xlib-xrender.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cairo-xlib.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cairo.h
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/cert.h
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/certdb.h
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/certt.h
@@ -2214,9 +2204,6 @@ drwxr-xr-x	root/root	usr/include/xulrunner-1.9/unstable/
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/p12.h
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/p12plcy.h
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/p12t.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/pixman-remap.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/pixman-version.h
--rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/pixman.h
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/pk11func.h
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/pk11pqg.h
 -rw-r--r--	root/root	usr/include/xulrunner-1.9/unstable/pk11priv.h
diff --git a/xulrunner/.md5sum b/xulrunner/.md5sum
index 046263b6f..94e4039cb 100644
--- a/xulrunner/.md5sum
+++ b/xulrunner/.md5sum
@@ -1,2 +1,2 @@
 4210ae0801df2eb498408533010d97c1  firefox-3.0-source.tar.bz2
-4eeff3909afbd7a41ce57d8a7625e3a2  mozconfig
+93029079c3c35a795eb96c4e0ee99364  mozconfig
diff --git a/xulrunner/Pkgfile b/xulrunner/Pkgfile
index 35eaceda0..bc8909afb 100644
--- a/xulrunner/Pkgfile
+++ b/xulrunner/Pkgfile
@@ -5,7 +5,7 @@
 
 name=xulrunner
 version=1.9
-release=1
+release=2
 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-3.0-source.tar.bz2
         mozconfig)
 
diff --git a/xulrunner/mozconfig b/xulrunner/mozconfig
index 715a5b0bc..baaa92247 100644
--- a/xulrunner/mozconfig
+++ b/xulrunner/mozconfig
@@ -12,6 +12,7 @@ ac_add_options --with-system-nspr
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-mng
+ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 ac_add_options --disable-tests
 ac_add_options --disable-mochitest