diff --git a/packages/web/fennec/build b/packages/web/fennec/build
index 1a421ef4e0..ace9895053 100755
--- a/packages/web/fennec/build
+++ b/packages/web/fennec/build
@@ -3,26 +3,85 @@
 . config/options
 
 $SCRIPTS/build toolchain
-$SCRIPTS/build xulrunner
+$SCRIPTS/build gtk+
+$SCRIPTS/build libIDL
+$SCRIPTS/build libIDL-host
 
-cd $BUILD/fennec*
+set -x
 
-mkdir -p .objdir-$1
-cd .objdir-$1
+export CROSS_COMPILE=yes
+export HOST_CC="$HOST_CC"
+export HOST_CXX="$HOST_CXX"
+export HOST_CFLAGS="$HOST_CFLAGS"
+export HOST_CXXFLAGS="$HOST_CXXFLAGS"
+export HOST_LDFLAGS="$HOST_LDFLAGS"
+export HOST_RANLIB="$HOST_RANLIB"
+export HOST_AR="$HOST_AR"
+export HOST_LIBIDL_CONFIG="$ROOT/$TOOLCHAIN/bin/libIDL-config-2"
 
-../configure --host=$TARGET_NAME \
-             --build=$HOST_NAME \
-             --prefix=/usr \
-             --sysconfdir=/etc \
-             --disable-static \
-             --enable-application=mobile \
-             --disable-debug \
-             --enable-mobile-optimize \
-             --disable-tests \
-             --disable-libnotify \
-             --with-system-libxul \
-             --with-libxul-sdk=$SYSROOT_PREFIX/usr/lib/xulrunner-devel
+export CFLAGS="$GCC_OPTIM -Wall -mtune=$TARGET_CPU"
+export CXXFLAGS="$CFLAGS"
 
-make
+cd $PKG_BUILD
 
-make package
+
+cat > .mozconfig <<EOF
+mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile"
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/.build
+
+# some variables needed for crosscompiling
+ac_add_options --host=$TARGET_NAME
+ac_add_options --build=$HOST_NAME
+
+# General config
+# ac_add_options --enable-debug
+# ac_add_options --disable-mobile-optimize
+ac_add_options --enable-optimize
+# ac_add_options --disable-optimize
+# ac_add_options --enable-logging
+# ac_cv_visibility_pragma=no
+# ac_add_options --enable-timeline
+# ac_add_options --enable-default-toolkit=cairo-gtk2
+# ac_add_options --enable-installer
+# ac_add_options --enable-logging
+# ac_add_options --enable-updater
+# ac_add_options --enable-plugins
+# ac_add_options --disable-view-source
+# ac_add_options --disable-printing
+# ac_add_options --disable-xprint
+ac_add_options --disable-libnotify
+# ac_add_options --with-libIDL
+# ac_add_options --disable-parental-controls
+# ac_add_options --with-system-bz2
+# ac_add_options --with-system-jpeg
+# ac_add_options --without-system-png
+# ac_add_options --with-system-zlib
+# ac_add_options --enable-canvas
+# ac_add_options --enable-safe-browsing
+# ac_add_options --enable-svg
+# ac_add_options --enable-system-cairo
+# ac_add_options --disable-system-sqlite
+
+ac_add_options --disable-tests
+ac_add_options --disable-dbus
+ac_add_options --disable-crashreporter
+ac_add_options --enable-libxul
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+
+# Xulrunner related options
+ac_add_app_options xulrunner --enable-application=xulrunner
+ac_add_app_options xulrunner --disable-javaxpcom
+
+# Fennec related options
+ac_add_app_options mobile --enable-application=mobile
+ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist
+
+# configure will be automatically generated using the 'autoconf-2.13'
+# command. If autoconf-2.13 isn't the right name for your system, as
+# is the case on OS X using MacPorts, use the real command name as
+# demonstrated below.
+mk_add_options AUTOCONF=autoconf-2.13
+EOF
+
+make -f client.mk build
diff --git a/packages/web/fennec/install b/packages/web/fennec/install
index b6537b9020..3a77f43886 100755
--- a/packages/web/fennec/install
+++ b/packages/web/fennec/install
@@ -2,7 +2,9 @@
 
 . config/options
 
-$SCRIPTS/install xulrunner
+$SCRIPTS/install gtk+
+$SCRIPTS/install libIDL
 
-mkdir -p $INSTALL/usr/lib
-  cp -PR $BUILD/fennec*/.objdir-$1/dist/$1 $INSTALL/usr/lib
+# copy source with -L to follow the syslinks
+  mkdir -p $INSTALL/usr/lib/fennec
+    cp -LR $BUILD/fennec*/.build/mobile/dist/bin/* $INSTALL/usr/lib/fennec