diff --git a/x11-themes/greybird/greybird-3.20.1.ebuild b/x11-themes/greybird/greybird-3.20.1-r1.ebuild
similarity index 60%
rename from x11-themes/greybird/greybird-3.20.1.ebuild
rename to x11-themes/greybird/greybird-3.20.1-r1.ebuild
index 44410f098694a..b8093ce376d4b 100644
--- a/x11-themes/greybird/greybird-3.20.1.ebuild
+++ b/x11-themes/greybird/greybird-3.20.1-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=6
+inherit autotools
 
 MY_PN=${PN/g/G}
 
@@ -18,31 +19,26 @@ IUSE="ayatana gnome"
 
 RDEPEND="
 	>=x11-themes/gtk-engines-murrine-0.90
+	>=x11-libs/gtk+-3.20.0
+"
+DEPEND="${RDEPEND}
+	dev-ruby/sass
+	dev-libs/glib:2
 "
 
-RESTRICT="binchecks strip"
-
 S=${WORKDIR}/${MY_PN}-${PV}
+#RESTRICT="binchecks strip"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
 
 src_install() {
-	dodoc README.md
-	rm -f README.md configure.ac autogen.sh Makefile.am LICENSE*
-
-	insinto /usr/share/themes/${MY_PN}-compact/xfwm4
-	doins xfwm4-compact/*
-	rm -rf xfwm4-compact
-
-	insinto /usr/share/themes/${MY_PN}-a11y/xfwm4
-	doins xfwm4-a11y/*
-	rm -rf xfwm4-a11y
-
-	insinto /usr/share/themes/${MY_PN}-bright/xfce-notify-4.0
-	doins xfce-notify-4.0_bright/*
-	rm -rf xfce-notify-4.0_bright
+	emake DESTDIR="${D}" install
 
+	pushd "${ED}"usr/share/themes/${MY_PN} > /dev/null || die
 	use ayatana || rm -rf unity
 	use gnome || rm -rf metacity-1
-
-	insinto /usr/share/themes/${MY_PN}
-	doins -r *
+	popd > /dev/null || die
 }
diff --git a/x11-themes/greybird/greybird-9999.ebuild b/x11-themes/greybird/greybird-9999.ebuild
index 4a05a61fd92c5..dd25b51b02b04 100644
--- a/x11-themes/greybird/greybird-9999.ebuild
+++ b/x11-themes/greybird/greybird-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit git-r3
+inherit autotools git-r3
 
 MY_PN=${PN/g/G}
 
@@ -19,29 +19,23 @@ IUSE="ayatana gnome"
 
 RDEPEND="
 	>=x11-themes/gtk-engines-murrine-0.90
+	>=x11-libs/gtk+-3.20.0
+"
+DEPEND="${RDEPEND}
+	dev-ruby/sass
+	dev-libs/glib:2
 "
 
-RESTRICT="binchecks strip"
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
 
 src_install() {
-	dodoc README.md
-	rm -f README.md configure.ac autogen.sh Makefile.am LICENSE*
-
-	insinto /usr/share/themes/${MY_PN}-compact/xfwm4
-	doins xfwm4-compact/*
-	rm -rf xfwm4-compact
-
-	insinto /usr/share/themes/${MY_PN}-a11y/xfwm4
-	doins xfwm4-a11y/*
-	rm -rf xfwm4-a11y
-
-	insinto /usr/share/themes/${MY_PN}-bright/xfce-notify-4.0
-	doins xfce-notify-4.0_bright/*
-	rm -rf xfce-notify-4.0_bright
+	emake DESTDIR="${D}" install
 
+	pushd "${ED}"usr/share/themes/${MY_PN} > /dev/null || die
 	use ayatana || rm -rf unity
 	use gnome || rm -rf metacity-1
-
-	insinto /usr/share/themes/${MY_PN}
-	doins -r *
+	popd > /dev/null || die
 }