diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index 260c8d2b8c..ee062a8a9f 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1 +1 @@
-DIST gtk-fortran-20.04.tar.gz 4066185 BLAKE2B 45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c SHA512 b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
+DIST gtk-fortran-3.24.18.tar.gz 4066185 BLAKE2B 45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c SHA512 b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
diff --git a/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch b/x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch
similarity index 100%
rename from x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch
rename to x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch
diff --git a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild b/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
similarity index 87%
rename from x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
rename to x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
index 02d8cd0a1d..e0c095bfbe 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,12 +10,12 @@ inherit cmake fortran-2
 
 DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
 HOMEPAGE="https://github.com/vmagnin/gtk-fortran"
-SRC_URI="https://github.com/vmagnin/${PN}/archive/v${PV}.gtk3.24.18.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/vmagnin/${PN}/archive/v20.04.gtk${PV}.tar.gz -> ${P}.tar.gz"
 
-S="${WORKDIR}/${P}.gtk3.24.18"
+S="${WORKDIR}/${PN}-20.04.gtk${PV}"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="3"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="examples high-level plplot static-libs"