diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
index fc8010b..b22762c 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
@@ -12,18 +12,18 @@ SRC_URI="http://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_appl
 
 LICENSE="Intel-SDP"
 SLOT="0"
-IUSE="android bundled_libs"
+IUSE="android +system-tbb system-clang +system-boost +system-qt"
 KEYWORDS="-* ~amd64"
 RESTRICT="mirror"
 
 RDEPEND="app-admin/eselect-opencl
 	sys-process/numactl
-	!bundled_libs? (
-		dev-cpp/tbb
-		sys-devel/clang
-		dev-libs/boost
-		dev-qt/qtgui:4
-		dev-qt/qtcore:4
+	system-tbb? ( >=dev-cpp/tbb-4.2.20131118 )
+	system-clang? ( =sys-devel/clang-3.4* )
+	system-boost? ( >=dev-libs/boost-1.52.0:= )
+	system-qt? (
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtcore-4.8.5:4
 		)
 	"
 DEPEND=""
@@ -50,11 +50,17 @@ src_unpack() {
 }
 
 src_prepare() {
-	if ! use bundled_libs; then
-		# Remove unnecessary and bundled stuff
+	# Remove bundled stuff
+	if use system-boost; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libboost*.so*
+	fi
+	if use system-clang; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libclang*
+	fi
+	if use system-qt; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libQt*
+	fi
+	if use system-tbb; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libtbb*
 	fi
 }
diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
index 7c78cd3..4064b68 100644
--- a/dev-util/intel-ocl-sdk/metadata.xml
+++ b/dev-util/intel-ocl-sdk/metadata.xml
@@ -11,7 +11,10 @@
 	</maintainer>
 	<use>
 		<flag name='android'>Install android related files</flag>
-		<flag name='bundled_libs'>Keep bundled-libs (not recommended)</flag>
 		<flag name='tools'>Install Intel Offline Compiler</flag>
+		<flag name='system-boost'>Use system boost (dev-libs/boost) instead of bundled one</flag>
+		<flag name='system-clang'>Use system clang (sys-devel/clang) instead of bundled one</flag>
+		<flag name='system-qt'>Use system Qt (sys-devel-qtcore, sys-devel/qtgui) instead of bundled one</flag>
+		<flag name='system-tbb'>Use sytem Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
 	</use>
 </pkgmetadata>