diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index c8f0939..77dfb4b 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -79,4 +79,4 @@ DIST mozilla-firefox-3.5.3-uk.xpi 141138 RMD160 522c3b4bd140f735734db57e308c87b0
 DIST mozilla-firefox-3.5.3-vi.xpi 128583 RMD160 2d3573fadbd8eef613c0745500972a7d45236867 SHA1 52bba7c75c06f65cad9415070abcba603accfbd2 SHA256 c4166530be662064433dc8ef17be7b2d112d8fb98528dc435773bdec6397f420
 DIST mozilla-firefox-3.5.3-zh-CN.xpi 126368 RMD160 63f6e11678bc02668f1dfbfce3aa35410a8741cd SHA1 ecda599e9f4c6e18090813e89d4ee3f293637a5f SHA256 1dd2d05f24970e65e4256b30623d8674f9f8442c65f3368e0528fbcafb1f146d
 DIST mozilla-firefox-3.5.3-zh-TW.xpi 127878 RMD160 3a73d903ad5a3333959009ef2ca3ba415ed02b61 SHA1 dee1493058445f0fe71ed83674b012e57bc16e6d SHA256 62ab618f9ec1cbf4b25694e1f6b93bf2761b7a5d0f39d20f3d41f5418bf48be0
-EBUILD mozilla-firefox-3.5.3-r1.ebuild 8859 RMD160 fdfe06879ce891bdad8b151e586d3144c4b562b0 SHA1 8d66ce8a89cf1786a6d2bdf8e17ea9710a268183 SHA256 8898dac6efda3d3405258695bc7e40c76cf6a2ea56bcd8056b1b4afcbfa62757
+EBUILD mozilla-firefox-3.5.3-r1.ebuild 9026 RMD160 6b2447309921778c4b0f8148158945b539735126 SHA1 2acc6f3b5eb4c9d2809f68e08d0bd3e82e4ccea9 SHA256 49f252443323fbfe72281da2e37d47ebe387fba55e0203685589a20da8d076f6
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.5.3-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.5.3-r1.ebuild
index a97e237..191fcaf 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-3.5.3-r1.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.5.3-r1.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa bindist java mozdevelop restrict-javascript" # qt-experimental
+IUSE="+alsa bindist java mozdevelop restrict-javascript sqlite" # qt-experimental
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
@@ -59,8 +59,9 @@ RDEPEND="
 	>=dev-libs/nss-3.12.2
 	>=dev-libs/nspr-4.7.3
 	>=app-text/hunspell-1.2
+	sqlite? ( >=dev-db/sqlite-3.6.10 )
 	alsa? ( media-libs/alsa-lib )
-	>=net-libs/xulrunner-${XUL_PV}[java=]
+	>=net-libs/xulrunner-${XUL_PV}[java=,sqlite=]
 	>=x11-libs/cairo-1.8.8[X]
 	x11-libs/pango[X]"
 
@@ -173,7 +174,6 @@ src_configure() {
 	# Use system libraries
 	mozconfig_annotate '' --enable-system-cairo
 	mozconfig_annotate '' --enable-system-hunspell
-	# mozconfig_annotate '' --enable-system-sqlite
 	mozconfig_annotate '' --with-system-nspr
 	mozconfig_annotate '' --with-system-nss
 	mozconfig_annotate '' --enable-system-lcms
@@ -181,6 +181,12 @@ src_configure() {
 	mozconfig_annotate '' --with-system-libxul
 	mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
 
+	if use sqlite ; then
+		mozconfig_annotate 'sqlite' --enable-system-sqlite
+	else
+		mozconfig_annotate '-sqlite' --enable-system-sqlite
+	fi
+
 	# IUSE mozdevelop
 	mozconfig_use_enable mozdevelop jsd
 	mozconfig_use_enable mozdevelop xpctools
@@ -275,7 +281,8 @@ EOF
 		die "failed to cp xulrunner-default-prefs.js"
 
 	# Plugins dir
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+		|| die "failed to symlink"
 }
 
 pkg_postinst() {