diff --git a/net-dialup/minimodem/minimodem-0.24.1.ebuild b/net-dialup/minimodem/minimodem-0.24.1.ebuild
index 22579a318..457964c1e 100644
--- a/net-dialup/minimodem/minimodem-0.24.1.ebuild
+++ b/net-dialup/minimodem/minimodem-0.24.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools-utils
+inherit autotools versionator
 
-MY_P=${P/.1/-1}
+MY_P="${PN}-$(replace_version_separator 2 '-')"
 
 DESCRIPTION="General-purpose software audio FSK modem."
 HOMEPAGE="https://github.com/kamalmostafa/minimodem"
@@ -22,14 +22,11 @@ DEPEND="sci-libs/fftw:3.0
 	sndfile? ( media-libs/libsndfile )"
 RDEPEND="${DEPEND}"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
 S="${WORKDIR}/${PN}-${MY_P}"
 
 src_prepare() {
-	#apply upstream patch
-#	epatch "${FILESDIR}/${P}-ttytdd.patch"
 	eautoreconf
+	eapply_user
 }
 
 src_configure() {
@@ -38,5 +35,5 @@ src_configure() {
 		$(use_with pulseaudio )
 		$(use_with sndfile )
 	)
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }
diff --git a/net-dialup/minimodem/minimodem-0.24_p1.ebuild b/net-dialup/minimodem/minimodem-0.24_p1.ebuild
deleted file mode 100644
index 891df47df..000000000
--- a/net-dialup/minimodem/minimodem-0.24_p1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-MY_P=${P/_p/-}
-
-DESCRIPTION="General-purpose software audio FSK modem."
-HOMEPAGE="https://github.com/kamalmostafa/minimodem"
-SRC_URI="https://github.com/kamalmostafa/minimodem/archive/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="alsa pulseaudio +sndfile"
-
-DEPEND="sci-libs/fftw:3.0
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )"
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	#apply upstream patch
-#	epatch "${FILESDIR}/${P}-ttytdd.patch"
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_with alsa )
-		$(use_with pulseaudio )
-		$(use_with sndfile )
-	)
-	autotools-utils_src_configure
-}