diff --git a/metadata/md5-cache/sys-power/powertop-2.10 b/metadata/md5-cache/sys-power/powertop-2.10
deleted file mode 100644
index 5ee3339..0000000
--- a/metadata/md5-cache/sys-power/powertop-2.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=tool to diagnose issues with power consumption and power management
-EAPI=6
-HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
-IUSE=nls unicode X kernel_linux
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
-SLOT=0
-SRC_URI=https://01.org/sites/default/files/downloads/powertop-v2.10.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	327865b9921771330775d971263dc234	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a26c18813fc897ca775e6793537619a0
diff --git a/metadata/md5-cache/sys-power/powertop-2.13 b/metadata/md5-cache/sys-power/powertop-2.13
new file mode 100644
index 0000000..76cbcbe
--- /dev/null
+++ b/metadata/md5-cache/sys-power/powertop-2.13
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive >=sys-devel/gettext-0.20.2 >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure prepare setup
+DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=tool to diagnose issues with power consumption and power management
+EAPI=7
+HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
+IUSE=nls unicode X kernel_linux
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
+SLOT=0
+SRC_URI=https://github.com/fenrus75/powertop/archive/v2.13.tar.gz -> powertop-2.13.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	327865b9921771330775d971263dc234	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b88b03046a1212255c08b100b5c9ef56
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index bb4c42a..98398ae 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,3 +1 @@
-DIST powertop-2.8.tar.gz 670000 SHA256 a87b563f73106babfa3e74dcf92f252938c061e309ace20a361358bbfa579c5a SHA512 253d0e15f0972cf8639735c510f4884d49a0da76c31dd2f39603e2297e6c6f0b9fa283c7b3cb04a431c91f8296275c0adaecc4c3e9ea132c0c31064f7f432c80 WHIRLPOOL 87b859b76395d6b1b380c7459b0d918713e94e8fc4ac40fde8b82f2112dec2df3caffb645b082cedd0bba5c232555de26e81fbe8dd3041875c32c864650ef132
-DIST powertop-v2.10.tar.gz 722992 BLAKE2B 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 SHA512 4219e7aadbeebdf6932c04f784434e4dd0f540bf4941d43c1830b1b5cad1f3928769b13897e24dd956b6bdee65fb1fbe902ee30685bca229b71e140d65367837
-DIST powertop-v2.9.tar.gz 718763 BLAKE2B bb6ce789614397b02f0e9f1cb71585cb456c1428cc43e9fe1c4b3bc9f96171fede4c587410e78e58ad8d0b0f772549a93f454bcd1b521e6dd3c809a85dc3cf30 SHA512 783af538c44e3fae7215a5b4247eb32a72e02150b3f297e6b9777a450823dd30aca014601892c0e80937a366eed95b42b622c68161d53e905ad4fbcb574b26f5
+DIST powertop-2.13.tar.gz 303030 BLAKE2B 3c88e05f9889cc4b276bea3bc50a3a83228ca8efae278379a14fadc6104754f2837174e028bf9c5ded9f3af84ce6b8766ac3d24b6ae62b9b192c03fc3afdec11 SHA512 8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181
diff --git a/sys-power/powertop/powertop-2.10.ebuild b/sys-power/powertop/powertop-2.13.ebuild
similarity index 87%
rename from sys-power/powertop/powertop-2.10.ebuild
rename to sys-power/powertop/powertop-2.13.ebuild
index adb89d4..0652c0a 100644
--- a/sys-power/powertop/powertop-2.10.ebuild
+++ b/sys-power/powertop/powertop-2.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
 
@@ -9,10 +9,8 @@
 	GIT_ECLASS="git-r3"
 	SRC_URI=""
 else
-	SRC_URI="https://01.org/sites/default/files/downloads/${PN}-v${PV}.tar.gz"
+	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="*"
-	MY_P="${PN}-v${PV}"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 inherit autotools ${GIT_ECLASS} linux-info
@@ -32,7 +30,8 @@
 
 BDEPEND="
 	virtual/pkgconfig
-	sys-devel/gettext
+	sys-devel/autoconf-archive
+	>=sys-devel/gettext-0.20.2
 "
 RDEPEND="
 	${DEPEND}
@@ -106,12 +105,10 @@
 	default
 
 	# Bug 599114
-	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX_11])|' configure.ac || die
+	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
 
-	if [[ ${PV} == "9999" ]] ; then
-		chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
-		scripts/version || die "Failed to extract version information"
-	fi
+	echo "\"${PV}\"" > version-short
+	echo "${PV}" > version-long
 
 	eautoreconf
 }