diff --git a/www-client/chromium/chromium-21.0.1180.57-r1.ebuild b/www-client/chromium/chromium-21.0.1180.57-r1.ebuild
index b1a95a8..4821284 100644
--- a/www-client/chromium/chromium-21.0.1180.57-r1.ebuild
+++ b/www-client/chromium/chromium-21.0.1180.57-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
+IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux nacl"
 
 RDEPEND="app-arch/bzip2
 	cups? (
@@ -53,7 +53,7 @@ RDEPEND="app-arch/bzip2
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
-	>=dev-lang/nacl-toolchain-newlib-0_p7311
+	nacl? ( >=dev-lang/nacl-toolchain-newlib-0_p7311 )
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/ply
@@ -243,6 +243,11 @@ src_configure() {
 			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 	fi
 
+	if ! use nacl; then
+		# disable native client library
+		myconf+=" -Ddisable_nacl=1"
+	fi
+
 	# Never use bundled gold binary. Disable gold linker flags for now.
 	myconf+="
 		-Dlinux_use_gold_binary=0
@@ -354,10 +359,15 @@ src_install() {
 
 	doexe out/Release/chromedriver || die
 
-	doexe out/Release/nacl_helper{,_bootstrap} || die
+	if use nacl; then
+		doexe out/Release/nacl_helper{,_bootstrap} || die
+	fi
 	insinto "${CHROMIUM_HOME}"
-	doins out/Release/nacl_irt_*.nexe || die
-	doins out/Release/libppGoogleNaClPluginChrome.so || die
+
+	if use nacl; then
+		doins out/Release/nacl_irt_*.nexe || die
+		doins out/Release/libppGoogleNaClPluginChrome.so || die
+	fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then