diff --git a/llvm-libunwind-3.9.1.ebuild b/llvm-libunwind-3.9.1.ebuild
index bab15d8..e96f2a5 100644
--- a/llvm-libunwind-3.9.1.ebuild
+++ b/llvm-libunwind-3.9.1.ebuild
@@ -20,21 +20,29 @@ IUSE="debug +static-libs"
 RDEPEND="!sys-libs/libunwind"
 # llvm-config and cmake files needed to get proper flags
 # (3.9.0 needed because cmake file install path changed)
-DEPEND=">=sys-devel/llvm-3.9.0[${MULTILIB_USEDEP}]"
+DEPEND=">=sys-devel/llvm-3.9.0"
 
 S="${WORKDIR}/${MY_P}.src"
 
 src_prepare() {
 	# add switch for static-libs; accepted upstream
 	eapply "${FILESDIR}/libunwind-3.9-cmake-static-lib.patch"
+	# add LIBUNWIND_LIBDIR_SUFFIX, bug 607390.
+	eapply "${FILESDIR}/${PN}-3.9.1-add-libunwind-libdir-suffix.patch"
 	default
 }
 
+src_configure() {
+        NATIVE_LIBDIR=$(get_libdir)
+        cmake-multilib_src_configure
+}
+
 multilib_src_configure() {
 	local libdir=$(get_libdir)
 
 	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib}
+		-DLIBUNWIND_LIBDIR_SUFFIX=${libdir#lib}
 		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
 		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
 	)