diff --git a/media-gfx/grafx2/grafx2-2.5.recipe b/media-gfx/grafx2/grafx2-2.5.recipe
deleted file mode 100644
index 90441071a..000000000
--- a/media-gfx/grafx2/grafx2-2.5.recipe
+++ /dev/null
@@ -1,70 +0,0 @@
-SUMMARY="The ultimate 256-color painting program"
-DESCRIPTION="GrafX2 is a bitmap paint program inspired by the Amiga programs \
-Deluxe Paint and Brilliance. Specialized in 256-color drawing, it includes a \
-very large number of tools and effects that make it particularly suitable for \
-pixel art, game graphics, and generally any detailed graphics painted with a \
-mouse."
-HOMEPAGE="http://grafx2.tk"
-COPYRIGHT="1995-2001 Sunset Design
-	2007-2018 GrafX2 project team"
-LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="https://gitlab.com/GrafX2/grafX2/-/archive/v2.5/grafX2-v2.5.tar.bz2"
-CHECKSUM_SHA256="0a9742b660f3fb3e88c45f67f70c4b4626629fd178eb75451f3693b2e4746667"
-SOURCE_DIR="grafX2-v2.5"
-PATCHES="grafx2-$portVersion.patchset"
-
-ARCHITECTURES="x86_gcc2 x86_64"
-
-PROVIDES="
-	grafx2
-	cmd:grafx2
-	"
-REQUIRES="
-	haiku
-	lib:libfreetype
-	lib:libiconv
-	lib:libjpeg
-	lib:liblua
-	lib:libpng
-	lib:libsdl
-	lib:libsdl_image
-	lib:libsdl_ttf
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libfreetype
-	devel:libiconv
-	devel:libjpeg
-	devel:liblua
-	devel:libpng
-	devel:libsdl
-	devel:libsdl_image
-	devel:libsdl_ttf
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:git
-	cmd:make
-	cmd:pkg_config
-	cmd:tar
-	cmd:which
-	"
-
-BUILD()
-{
-	cd src
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd src
-	mkdir -p $dataDir
-	make install DESTDIR=$prefix prefix=/ datarootdir=/$relativeDataRootDir
-
-	addAppDeskbarSymlink $binDir/grafx2 GrafX2
-}
diff --git a/media-gfx/grafx2/grafx2-2.6.recipe b/media-gfx/grafx2/grafx2-2.6.recipe
deleted file mode 100644
index 9919c71c5..000000000
--- a/media-gfx/grafx2/grafx2-2.6.recipe
+++ /dev/null
@@ -1,73 +0,0 @@
-SUMMARY="The ultimate 256-color painting program"
-DESCRIPTION="GrafX2 is a bitmap paint program inspired by the Amiga programs \
-Deluxe Paint and Brilliance. Specialized in 256-color drawing, it includes a \
-very large number of tools and effects that make it particularly suitable for \
-pixel art, game graphics, and generally any detailed graphics painted with a \
-mouse."
-HOMEPAGE="http://grafx2.tk"
-COPYRIGHT="1995-2001 Sunset Design
-	2007-2019 GrafX2 project team"
-LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="https://gitlab.com/GrafX2/grafX2/-/archive/v$portVersion/grafX2-v$portVersion.tar.bz2"
-SOURCE_DIR="grafX2-v$portVersion"
-CHECKSUM_SHA256="a672d381df55a8180febb005cbafbbfc87b8f7eeec9743acdc33214cc59a2e00"
-
-ARCHITECTURES="x86_gcc2 x86_64"
-
-PROVIDES="
-	grafx2
-	cmd:grafx2
-	"
-REQUIRES="
-	haiku
-	lib:libfreetype
-	lib:libiconv
-	lib:libjpeg
-	lib:liblua
-	lib:libpng16
-	lib:libSDL_1.2
-	lib:libSDL_image_1.2
-	lib:libSDL_ttf_2.0
-	lib:libtiff
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libfreetype
-	devel:libiconv
-	devel:libjpeg
-	devel:liblua
-	devel:libpng16
-	devel:libSDL_1.2
-	devel:libSDL_image_1.2
-	devel:libSDL_ttf_2.0
-	devel:libtiff
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:git
-	cmd:make
-	cmd:pkg_config
-	cmd:tar
-	cmd:which
-	"
-
-BUILD()
-{
-	cd src
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd src
-	mkdir -p $dataDir
-	make install DESTDIR=$prefix PREFIX=/ datarootdir=/$relativeDataRootDir
-
-	rm -rf $dataDir/{applications,icons,metainfo}
-
-	addAppDeskbarSymlink $binDir/grafx2 GrafX2
-}
diff --git a/media-gfx/grafx2/grafx2-2.7.recipe b/media-gfx/grafx2/grafx2-2.7.recipe
new file mode 100644
index 000000000..07d0c9cd6
--- /dev/null
+++ b/media-gfx/grafx2/grafx2-2.7.recipe
@@ -0,0 +1,76 @@
+SUMMARY="The ultimate 256-color painting program"
+DESCRIPTION="GrafX2 is a bitmap paint program inspired by the Amiga programs \
+Deluxe Paint and Brilliance. Specialized in 256-color drawing, it includes a \
+very large number of tools and effects that make it particularly suitable for \
+pixel art, game graphics, and generally any detailed graphics painted with a \
+mouse."
+HOMEPAGE="http://grafx2.tk"
+COPYRIGHT="1995-2001 Sunset Design
+	2007-2020 GrafX2 project team"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="http://pulkomandy.tk/projects/GrafX2/downloads/51"
+SOURCE_FILENAME="grafx2-2.7.tar.gz"
+SOURCE_DIR="grafx2"
+CHECKSUM_SHA256="a0246ab43f4b7d56d40cd03f53ca48f2b107dcb849e565be1379798d9b68961e"
+PATCHES="grafx2-2.7.patchset"
+
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	grafx2$secondaryArchSuffix
+	cmd:grafx2
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:liblua$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libSDL_1.2$secondaryArchSuffix
+	lib:libSDL_image_1.2$secondaryArchSuffix
+	lib:libSDL_ttf_2.0$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libfreetype$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:liblua$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libSDL_1.2$secondaryArchSuffix
+	devel:libSDL_image_1.2$secondaryArchSuffix
+	devel:libSDL_ttf_2.0$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:tar
+	cmd:which
+	"
+
+BUILD()
+{
+	cd src
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd src
+	mkdir -p $dataDir
+	make install DESTDIR=$prefix PREFIX=/ datarootdir=/$relativeDataRootDir
+
+	rm -rf $dataDir/{applications,icons,metainfo}
+
+	addAppDeskbarSymlink $binDir/grafx2 GrafX2
+}
diff --git a/media-gfx/grafx2/patches/grafx2-2.5.patchset b/media-gfx/grafx2/patches/grafx2-2.5.patchset
deleted file mode 100644
index ae1253d69..000000000
--- a/media-gfx/grafx2/patches/grafx2-2.5.patchset
+++ /dev/null
@@ -1,24 +0,0 @@
-From 757f765373b5ff1ac2a55213fcea0b0fbd5e3606 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Sun, 6 May 2018 19:16:10 +0200
-Subject: Fix make install
-
-
-diff --git a/src/Makefile b/src/Makefile
-index 005e847..43fd3d0 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -789,6 +789,10 @@ install : $(BIN)
- 	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/libs || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/libs
- 	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/palette || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/palette
- 	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture
-+	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson
-+	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson/lib || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson/lib
-+	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit
-+	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit/lib || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit/lib
- 	test -d $(DESTDIR)$(datadir)/applications || $(MKDIR) $(DESTDIR)$(datadir)/applications
- 	test -d $(DESTDIR)$(pixmapdir) || $(MKDIR) $(DESTDIR)$(pixmapdir)
- 	
--- 
-2.16.2
-
diff --git a/media-gfx/grafx2/patches/grafx2-2.7.patchset b/media-gfx/grafx2/patches/grafx2-2.7.patchset
new file mode 100644
index 000000000..464d10bdf
--- /dev/null
+++ b/media-gfx/grafx2/patches/grafx2-2.7.patchset
@@ -0,0 +1,60 @@
+From 6072ca85a059b9bf91b8e6d0048689040a8d673c Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 1 Feb 2020 22:34:01 +0100
+Subject: Add missing file.
+
+
+diff --git a/src/grafx2.rdef b/src/grafx2.rdef
+new file mode 100644
+index 0000000..623271d
+--- /dev/null
++++ b/src/grafx2.rdef
+@@ -0,0 +1,45 @@
++
++resource vector_icon array {
++	$"6E6369660705000300FFFF036E0070020006023EEB4C3EBC16BEBC163EEB4C4B"
++	$"486546B13B0005AAFFFF0422B8020102023F30000000000000003F0000488000"
++	$"48C000FF04FCFFFF0080FFEB0005FF02010202BECF30AFF9E52FA1B2BE90DF4B"
++	$"0DC74AD26C004D037C00FF73096FFF0C0A1020203420402C4C20602060345440"
++	$"604C60604C60405434602060204C2C4020340A06B3BEB3D33522382626262638"
++	$"22350A065E224C22402E43314E265A260A06B3CB5EB3CB4C2E403143264E265A"
++	$"0A04B5532A2A2A2A2EB5532E0A042A2E2E2E2E322A320A042A362E362E3A2A3A"
++	$"0A0432B54636B546362A322A0A04322E362E36323232060FFFAFAA3FC2A9C2C4"
++	$"C38CC1E5C1C6C3A4C2A9C5EDC1C6C50EC2A9C5EDC332C567C332C567C29BC4D2"
++	$"C332C34BC29BC3E0C3CAC2B6C557C34BC4C0C2B6C597C38AC5C5C428C5BBC3D8"
++	$"C5C5C428C5C5C8FBC66AC99D51C982C77CC890C9A1C674C918C5ED51C87451C8"
++	$"74C682C6FF51C413C687C589C676C399C5E0C2C4C640C322C4FDC1E50637FFAA"
++	$"FEFFAAAAAAAAA86A86FAAB3FB771C442B771C442B663C551B771C816B663C707"
++	$"B880C924BB45C816BA36C924BBE5C776BC09C5CABC26C69BBC09C5CABCCCC68E"
++	$"BD2EC62CBB45C442BA1FC568BA81C5CABB38C513BB38C513BBB6C5E7BAE3C7B4"
++	$"BB99C6FDBA0AC88CB7D3C7B4B8ACC88CB6FBC6DCB7D3C4A4B6FBC57DB7D3C4A4"
++	$"BB45C133BB45C133BBB1C0C7BCCCC133BC60C0C7BD39C19FBCCCC2BBBD39C24F"
++	$"BCCCC2BBBC09C37FBDF2C568BE54C506BD07C3B9BF63C3F7C102C259BF7AC0D1"
++	$"C102BF4947C0D1C411BF49473BC3AFBC9CC34DBC3AC228BD60C0A0BBD8C214BA"
++	$"64C523C523BE37C5ADBDAEC5ADBA64C8F7BA64C980B9DAC5ADB9DAB607C523B6"
++	$"91B9DAC1DABFDCBBD8C34DBF4947C00DC03E3BC03E3BBF9CBD1FBDF23BBE94BD"
++	$"1FBD50BE64BDF2C00DBD50BF6BBDF2C00DC03EC259BF2FC368BD1CC32FBD2EC3"
++	$"1DBD2EC31DBDD1C27ABD2EC0D1BDD1C173BC8CC02FBAE3C0D1BB85C02FBAE3C0"
++	$"D10A042AB5532EB5532E2A2A2A080A030100000A02010102BFFFFC3098AAB098"
++	$"AABFFFFC4BFEDD4BFEF20A01070401050607080B000A0501091001158200040A"
++	$"05010A1001178110040A04020203000A000100100217830004157F00040A0602"
++	$"030202C0000018ED4E98ED4EC000004C00004BFFFF"
++};
++
++resource app_signature "application/x-vnd.GrafX2";
++
++resource app_version {
++	major  = 2,
++	middle = 7,
++	minor  = 2945,
++
++	variety = B_APPV_GOLDEN_MASTER,
++	internal = 0,
++
++	short_info = "GrafX2",
++	long_info = "The ultimate 256-color painting program"
++};
++
+-- 
+2.24.0
+