diff --git a/media-gfx/grafx2/grafx2-2.5.recipe b/media-gfx/grafx2/grafx2-2.5.recipe
index 034af1707..0dd1ec446 100644
--- a/media-gfx/grafx2/grafx2-2.5.recipe
+++ b/media-gfx/grafx2/grafx2-2.5.recipe
@@ -4,12 +4,15 @@ 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://pulkomandy.tk/projects/GrafX2"
-COPYRIGHT="1995-1999 Sunset Design
-	2008-2015 GrafX2 project team"
+HOMEPAGE="http://grafx2.tk"
+COPYRIGHT="1995-2001 Sunset Design
+	2007-2018 GrafX2 project team"
 LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="svn://pulkomandy.tk/GrafX2/trunk#2127"
+REVISION="3"
+SOURCE_URI="https://gitlab.com/GrafX2/grafX2/-/archive/v2.5/grafX2-v2.5.tar.bz2"
+SOURCE_DIR="grafX2-v2.5"
+PATCHES="grafx2-$portVersion.patchset"
+CHECKSUM_SHA256="6c7d134e2e34f56d07f59c6b0355d04a9fc6a0b4049f2bbe387aa6c5a576fa76"
 
 ARCHITECTURES="x86_gcc2"
 
@@ -19,6 +22,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
+	lib:libiconv
 	lib:libsdl
 	lib:libsdl_image
 	lib:libsdl_ttf
@@ -31,6 +35,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
+	devel:libiconv
 	devel:libsdl
 	devel:libsdl_image
 	devel:libsdl_ttf
@@ -43,7 +48,10 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
-	cmd:svnversion
+	cmd:pkg_config
+	cmd:git
+	cmd:tar
+	cmd:which
 	"
 
 BUILD()
@@ -55,6 +63,7 @@ BUILD()
 INSTALL()
 {
 	cd src
+	mkdir -p $dataDir
 	make install DESTDIR=$prefix prefix=/ datarootdir=/$relativeDataRootDir
 
 	addAppDeskbarSymlink $binDir/grafx2 GrafX2
diff --git a/media-gfx/grafx2/patches/grafx2-2.5.patchset b/media-gfx/grafx2/patches/grafx2-2.5.patchset
new file mode 100644
index 000000000..ae1253d69
--- /dev/null
+++ b/media-gfx/grafx2/patches/grafx2-2.5.patchset
@@ -0,0 +1,24 @@
+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
+