diff --git a/app-forensics/aflplusplus/aflplusplus-3.12c.ebuild b/app-forensics/aflplusplus/aflplusplus-3.12c-r1.ebuild
similarity index 97%
rename from app-forensics/aflplusplus/aflplusplus-3.12c.ebuild
rename to app-forensics/aflplusplus/aflplusplus-3.12c-r1.ebuild
index 8f54edd03d12a..bd5b17d198b8f 100644
--- a/app-forensics/aflplusplus/aflplusplus-3.12c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-3.12c-r1.ebuild
@@ -57,6 +57,7 @@ src_prepare() {
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
 		CFLAGS_FLTO="" \
 		PREFIX="${EPREFIX}/usr" \
 		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
@@ -66,7 +67,7 @@ src_compile() {
 
 src_install() {
 	emake \
-		DESTDIR="${D}"
+		DESTDIR="${D}" \
 		PREFIX="${EPREFIX}/usr" \
 		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
 		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \