diff --git a/dev-cpp/finalcut/finalcut-0.9.1.ebuild b/dev-cpp/finalcut/finalcut-0.9.1-r1.ebuild
similarity index 89%
rename from dev-cpp/finalcut/finalcut-0.9.1.ebuild
rename to dev-cpp/finalcut/finalcut-0.9.1-r1.ebuild
index ac8b77e71b..9ad7ecdd3f 100644
--- a/dev-cpp/finalcut/finalcut-0.9.1.ebuild
+++ b/dev-cpp/finalcut/finalcut-0.9.1-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="LGPL-3+"
 SLOT="0/${PV}"
-IUSE="doc examples +gpm static-libs test"
+IUSE="doc examples +gpm test"
 REQUIRED_USE="test? ( !examples )"
 RESTRICT="!test? ( test )"
 
@@ -36,11 +36,21 @@ BDEPEND="
 
 RDEPEND="${DEPEND}"
 
+DOCS=(
+	AUTHORS
+	ChangeLog
+	CODE_OF_CONDUCT.md
+	Contributing.md
+	SECURITY.md
+)
+
 src_prepare() {
 	default
 
 	[[ "${PV}" = 9999 ]] || eapply "${FILESDIR}/${P}-fix-tests.ebuild"
 
+	sed -i "/doc_DATA/d" Makefile.am || die
+
 	sed -i "/AM_CPPFLAGS/ s/-Werror//" {examples,final,test}/Makefile.am \
 		|| die 'Failed to remove `-Werror` from `CPPFLAGS`'
 
@@ -58,14 +68,16 @@ src_configure() {
 	use test && append-cxxflags -O0 -DDEBUG -DUNIT_TEST
 
 	econf \
-		$(use_enable static-libs static) \
 		$(use_with gpm) \
 		$(use_with test unit-test)
 }
 
 src_install() {
+	einstalldocs
+
 	emake DESTDIR="${ED}" PACKAGE="${PF}" install
-	dodoc CODE_OF_CONDUCT.md Contributing.md SECURITY.md
+
+	use doc || dodoc doc/first-steps*
 
 	if use examples; then
 			local examples="/usr/share/doc/${PF}/examples"
diff --git a/dev-cpp/finalcut/finalcut-9999.ebuild b/dev-cpp/finalcut/finalcut-9999.ebuild
index f7f4adbc5f..9ad7ecdd3f 100644
--- a/dev-cpp/finalcut/finalcut-9999.ebuild
+++ b/dev-cpp/finalcut/finalcut-9999.ebuild
@@ -17,8 +17,8 @@ else
 fi
 
 LICENSE="LGPL-3+"
-SLOT="0/0.9.0"
-IUSE="doc examples +gpm static-libs test"
+SLOT="0/${PV}"
+IUSE="doc examples +gpm test"
 REQUIRED_USE="test? ( !examples )"
 RESTRICT="!test? ( test )"
 
@@ -36,11 +36,21 @@ BDEPEND="
 
 RDEPEND="${DEPEND}"
 
+DOCS=(
+	AUTHORS
+	ChangeLog
+	CODE_OF_CONDUCT.md
+	Contributing.md
+	SECURITY.md
+)
+
 src_prepare() {
 	default
 
 	[[ "${PV}" = 9999 ]] || eapply "${FILESDIR}/${P}-fix-tests.ebuild"
 
+	sed -i "/doc_DATA/d" Makefile.am || die
+
 	sed -i "/AM_CPPFLAGS/ s/-Werror//" {examples,final,test}/Makefile.am \
 		|| die 'Failed to remove `-Werror` from `CPPFLAGS`'
 
@@ -58,14 +68,16 @@ src_configure() {
 	use test && append-cxxflags -O0 -DDEBUG -DUNIT_TEST
 
 	econf \
-		$(use_enable static-libs static) \
 		$(use_with gpm) \
 		$(use_with test unit-test)
 }
 
 src_install() {
+	einstalldocs
+
 	emake DESTDIR="${ED}" PACKAGE="${PF}" install
-	dodoc CODE_OF_CONDUCT.md Contributing.md SECURITY.md
+
+	use doc || dodoc doc/first-steps*
 
 	if use examples; then
 			local examples="/usr/share/doc/${PF}/examples"