diff --git a/sys-fs/gfs2-utils/gfs2-utils-3.5.1.ebuild b/sys-fs/gfs2-utils/gfs2-utils-3.5.1-r1.ebuild
similarity index 89%
rename from sys-fs/gfs2-utils/gfs2-utils-3.5.1.ebuild
rename to sys-fs/gfs2-utils/gfs2-utils-3.5.1-r1.ebuild
index bd73418539..2259f119bc 100644
--- a/sys-fs/gfs2-utils/gfs2-utils-3.5.1.ebuild
+++ b/sys-fs/gfs2-utils/gfs2-utils-3.5.1-r1.ebuild
@@ -40,7 +40,9 @@ src_prepare() {
 	eapply "${FILESDIR}"/gfs2_withdraw_helper.patch
 	eapply "${FILESDIR}"/python3.patch
 
-	sed -i '/^CFLAGS=/s!\$\(GDB_FLAGS\|OPT_CFLAGS\)\s*!!g' configure.ac || die
+	sed -e '/^CFLAGS=/s!\s*\$\(GDB_FLAGS\|OPT_CFLAGS\)!!g' \
+		-e '/^CPPFLAGS=/s!\s*\$OPT_CPPFLAGS!!' \
+		-i configure.ac || die
 
 	default