diff --git a/sci-biology/geneathome/geneathome-1.10-r1.ebuild b/sci-biology/geneathome/geneathome-1.10-r2.ebuild
similarity index 88%
rename from sci-biology/geneathome/geneathome-1.10-r1.ebuild
rename to sci-biology/geneathome/geneathome-1.10-r2.ebuild
index 26315147c9..43ec787230 100644
--- a/sci-biology/geneathome/geneathome-1.10-r1.ebuild
+++ b/sci-biology/geneathome/geneathome-1.10-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+BOINC_SUBMODULE="samples/${PN}"
 BOINC_MASTER_URL="https://gene.disi.unitn.it/test/"
 BOINC_INVITATION_CODE="science@tn"
 BOINC_HELPTEXT=\
@@ -16,7 +17,7 @@ COMMIT="3186afba409a"
 DESCRIPTION="BOINC application for expanding Gene Regulatory Networks (GRN)"
 HOMEPAGE+=" https://bitbucket.org/francesco-asnicar/pc-boinc"
 SRC_URI="https://bitbucket.org/francesco-asnicar/${MY_PN}/get/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/francesco-asnicar-pc-boinc-${COMMIT}"
+BOINC_S="francesco-asnicar-${MY_PN}-${COMMIT}"
 
 LICENSE="sunpro public-domain"
 SLOT="0"
@@ -31,8 +32,11 @@ DOCS=( Readme.md )
 
 boinc-app_add_deps
 
+boinc_require_source 7.16.16
+boinc_enable_autotools
+
 src_prepare() {
-	default
+	boinc_src_prepare
 
 	# error: inlining failed in call to ‘always_inline’ ‘int fprintf(FILE*, const char*, ...)’: target specific option mismatch
 	sed  -i src/main.cpp \
@@ -42,7 +46,7 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC CXX
-	emake BOINC_DIR=/usr/include/boinc -C src
+	emake -C src
 }
 
 src_test() {