diff --git a/app-text/gpp/gpp-2.25.recipe b/app-text/gpp/gpp-2.25.recipe
new file mode 100644
index 000000000..a01d2c553
--- /dev/null
+++ b/app-text/gpp/gpp-2.25.recipe
@@ -0,0 +1,45 @@
+SUMMARY="A general-purpose preprocessor"
+DESCRIPTION="GPP is a general-purpose preprocessor with customizable syntax, \
+suitable for a wide range of preprocessing tasks. Its independence from any \
+programming language makes it much more versatile than cpp, while its syntax \
+is lighter and more flexible than that of m4."
+HOMEPAGE="http://files.nothingisreal.com/software/gpp/gpp.html"
+COPYRIGHT="1996–2001 Denis Auroux
+	2003-2004 Tristan Miller"
+LICENSE="GPP"
+REVISION="1"
+SOURCE_URI="https://github.com/logological/gpp/archive/2.25.tar.gz"
+CHECKSUM_SHA256="7c6c927fde33a43fadbe14c5ab9067742fa72321d6ed95eaae4ae36b269131a0"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	gpp
+	cmd:gpp
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:awk
+	cmd:gcc
+	cmd:make
+	"
+
+BUILD()
+{
+	autoreconf -vfi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
diff --git a/app-text/gpp/gpp-2.4.recipe b/app-text/gpp/gpp-2.4.recipe
deleted file mode 100644
index da30451a2..000000000
--- a/app-text/gpp/gpp-2.4.recipe
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION="
-GPP is a general-purpose preprocessor with customizable syntax, suitable for a \
-wide range of preprocessing tasks. Its independence from any programming \
-language makes it much more versatile than cpp, while its syntax is lighter \
-and more flexible than that of m4.
-"
-HOMEPAGE="http://files.nothingisreal.com/software/gpp/gpp.html"
-SOURCE_URI="http://files.nothingisreal.com/software/gpp/gpp-2.24.tar.bz2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="f04c2a23312ab3d0c462c7972d1c6aa6"
-BUILD()
-{
-	cd gpp-2.24
-	libtoolize --force --copy --install
-	aclocal
-	automake --add-missing -Wnone
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd gpp-2.24
-	make install
-}
-
-LICENSE="GPP"
-COPYRIGHT="1996–2001 Denis Auroux
-	2003-2004 Tristan Miller"