diff --git a/app-text/fbreader/fbreader-0.12.10.ebuild b/app-text/fbreader/fbreader-0.12.10.ebuild
index fce0823..568c1ad 100644
--- a/app-text/fbreader/fbreader-0.12.10.ebuild
+++ b/app-text/fbreader/fbreader-0.12.10.ebuild
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
 IUSE="debug gtk +qt4"
-DEPEND="dev-libs/expat
+RDEPEND="
+	dev-libs/expat
 	dev-libs/liblinebreak
 	net-misc/curl
 	dev-libs/fribidi
@@ -24,7 +25,9 @@ DEPEND="dev-libs/expat
 	qt4? ( x11-libs/qt-gui:4 )
 	gtk? ( >=x11-libs/gtk+-2.4:2 )
 	"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 REQUIRED_USE=" ^^ ( qt4 gtk )"
 
@@ -35,8 +38,8 @@ src_prepare() {
 	sed -i "s:^Name=E-book reader:Name=FBReader:" fbreader/desktop/desktop || die "sed failed"
 	sed -i "s:^Name\[ru\]=.*$:Name\[ru\]=FBReader:" fbreader/desktop/desktop || die "sed failed"
 	sed -i "s:^Icon=FBReader.png:Icon=FBReader:" fbreader/desktop/desktop || die "sed failed"
-	sed -i "/^	LDFLAGS += -s$/ d" makefiles/config.mk || die "sed failed"
-	sed -i "/^LDFLAGS =$/ d" makefiles/arch/desktop.mk || die "sed failed"
+	sed -i "s:^\(	CFLAGS +=\) -O3\$:\1 ${CXXFLAGS} `pkg-config --cflags fribidi`:" makefiles/config.mk || die "sed failed"
+	sed -i "s:^\(	LDFLAGS +=\) -s\$:\1 ${LDFLAGS}:" makefiles/config.mk || die "sed failed"
 
 	echo "TARGET_ARCH = desktop" > makefiles/target.mk
 	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk