diff --git a/dev-libs/bitset/bitset-2.8.4-r2.ebuild b/dev-libs/bitset/bitset-2.8.4-r3.ebuild
similarity index 87%
rename from dev-libs/bitset/bitset-2.8.4-r2.ebuild
rename to dev-libs/bitset/bitset-2.8.4-r3.ebuild
index a40c6612612d4..a05daebd63796 100644
--- a/dev-libs/bitset/bitset-2.8.4-r2.ebuild
+++ b/dev-libs/bitset/bitset-2.8.4-r3.ebuild
@@ -26,6 +26,11 @@ DOCS=( README.md )
 
 src_prepare() {
 	default
+
+	# Disable aggressive optimization, which does not respect CFLAGS
+	# with new autoconf, bug #815637
+	sed -i -e '/AX_CC_MAXOPT/d' configure.ac || die
+
 	eautoreconf
 }