diff --git a/app-portage/portage-utils/portage-utils-0.84.ebuild b/app-portage/portage-utils/portage-utils-0.84-r1.ebuild
similarity index 94%
rename from app-portage/portage-utils/portage-utils-0.84.ebuild
rename to app-portage/portage-utils/portage-utils-0.84-r1.ebuild
index d1e5d7ff75ff3..f6aff824f7a90 100644
--- a/app-portage/portage-utils/portage-utils-0.84.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.84-r1.ebuild
@@ -60,6 +60,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+
+	# fix #705636, basically apply 2f917fee
+	sed -i -e '/free(name);/d' libq/tree.c || die
+}
+
 src_configure() {
 	econf \
 		--disable-maintainer-mode \