diff --git a/app-text/texlive_core/texlive_core-2024.2.recipe b/app-text/texlive_core/texlive_core-2024.2.recipe
index 27795c5d2..8f807372d 100644
--- a/app-text/texlive_core/texlive_core-2024.2.recipe
+++ b/app-text/texlive_core/texlive_core-2024.2.recipe
@@ -158,7 +158,6 @@ PROVIDES="
 	cmd:gftopk
 	cmd:gftype
 	cmd:git_latexdiff
-	cmd:gregorio
 	cmd:gsftopk
 	cmd:hilatex
 	cmd:hishrink
@@ -590,7 +589,6 @@ defineDebugInfoPackage texlive_core$secondaryArchSuffix \
 	$prefix/bin/gftodvi \
 	$prefix/bin/gftopk \
 	$prefix/bin/gftype \
-	$prefix/bin/gregorio \
 	$prefix/bin/gsftopk \
 	$prefix/bin/hishrink \
 	$prefix/bin/histretch \
@@ -861,6 +859,7 @@ BUILD()
 		--disable-dvi2tty \
 		--disable-dvipng \
 		--disable-dvisvgm \
+		--disable-gregorio \
 		--disable-t1utils \
 		--build=$HOST --host=$HOST
 
diff --git a/dev-tex/gregorio/gregorio-6.0.0.recipe b/dev-tex/gregorio/gregorio-6.0.0.recipe
new file mode 100644
index 000000000..6bbadd240
--- /dev/null
+++ b/dev-tex/gregorio/gregorio-6.0.0.recipe
@@ -0,0 +1,49 @@
+SUMMARY="Tools for typesetting Gregorian chant"
+DESCRIPTION="Gregorio is a software application for engraving Gregorian Chant scores on a \
+computer. Gregorio's main job is to convert a gabc file (simple text representation of a score) \
+into a GregorioTeX file, which makes TeX able to create a PDF of your score."
+HOMEPAGE="http://gregorio-project.github.io/"
+COPYRIGHT="2007-2021 The Gregorio Project"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="https://github.com/gregorio-project/gregorio/releases/download/v$portVersion/gregorio-$portVersion.tar.bz2"
+CHECKSUM_SHA256="e2a3da9cb760cfd3bd152440bbd40c1776be430de8f421dc21cee70ae48a63b2"
+PATCHES="gregorio-$portVersion.patchset"
+
+ARCHITECTURES="all"
+
+PROVIDES="
+	gregorio = $portVersion
+	cmd:gregorio = $portVersion
+	"
+REQUIRES="
+	haiku
+	cmd:kpsewhich
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	gcc_syslibs_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:awk
+	cmd:gcc
+	cmd:make
+	"
+
+defineDebugInfoPackage gregorio \
+	$binDir/gregorio
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure --disable-version-in-exe
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
diff --git a/dev-tex/gregorio/patches/gregorio-6.0.0.patchset b/dev-tex/gregorio/patches/gregorio-6.0.0.patchset
new file mode 100644
index 000000000..7b1c20a74
--- /dev/null
+++ b/dev-tex/gregorio/patches/gregorio-6.0.0.patchset
@@ -0,0 +1,66 @@
+From a59bef58d9ddc54ad69f0ee802666804ae2fbc7b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
+Date: Fri, 23 Aug 2024 18:42:43 +0200
+Subject: disable PIE, remove BRANCH_VERSION
+
+ * PIE is unsupported on Haiku, but not detected correctly.
+ * the BRANCH_VERSION detection is faulty because it checks whether
+   a .git directory exists, which is the case in haikuporter.
+   We build from a tarball, so remove that code entirely.
+
+diff --git a/configure.ac b/configure.ac
+index c43ef39..65f8ce5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,7 +45,6 @@ dnl until flex gets their act together, use pedantic instead of pedantic-errors
+ AX_CHECK_COMPILE_FLAG([-pedantic], [CFLAGS+=" -pedantic"])
+ dnl AX_CHECK_COMPILE_FLAG([-pedantic-errors], [CFLAGS+=" -pedantic-errors"])
+ AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS+=" -fstack-protector-strong"])
+-AX_CHECK_COMPILE_FLAG([-fPIE], [CFLAGS+=" -fPIE"])
+ AX_CHECK_COMPILE_FLAG([-Wformat=2], [CFLAGS+=" -Wformat=2"])
+ AX_CHECK_COMPILE_FLAG([-Werror=format-security], [CFLAGS+=" -Werror=format-security"])
+ AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS+=" -Wstrict-prototypes"])
+@@ -55,10 +54,7 @@ AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS+=" -Wextra"])
+ AX_CHECK_COMPILE_FLAG([-Wno-gnu-statement-expression], [CFLAGS+=" -Wno-gnu-statement-expression"])
+ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS+=" -Wl,-z,relro"])
+ AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS+=" -Wl,-z,now"])
+-AX_CHECK_LINK_FLAG([-fPIE], [LDFLAGS+=" -fPIE"])
+-AX_CHECK_LINK_FLAG([-pie], [LDFLAGS+=" -pie"])
+ 
+-AC_HEADER_STDC
+ 
+ gl_FUNC_REALPATH_WORKS
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5059209..520352e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -27,25 +27,6 @@ gregorio__GREGORIO_EXE_SUFFIX__SOURCES = \
+ 	gregoriotex/gregoriotex-write.c gregoriotex/gregoriotex-position.c \
+ 	gregoriotex/gregoriotex.h
+ 
+-@MK@ifneq ($(wildcard ../.git),)
+-@MK@  _tag_ = $(shell git describe --exact-match HEAD 2>/dev/null)
+-@MK@  ifeq ($(_tag_),)
+-@MK@    DEFS += -DBRANCH_VERSION='"$(shell git rev-parse --abbrev-ref HEAD)-$(shell git rev-parse --short HEAD)-$(shell git rev-list HEAD --count)"'
+-@MK@  endif
+-@MK@else
+-@MK@  ifneq ($(wildcard ../.hg/git),)
+-@MK@    _gitnode_ = $(shell hg log --template='{gitnode}' -r .)
+-@MK@    ifeq ($(_gitnode_),)
+-@MK@      DEFS += -DBRANCH_VERSION='"$(shell hg log --template='{activebookmark}-hg:{manifest}' -r .)"'
+-@MK@    else
+-@MK@      _tag_ = $(shell git --git-dir=../.hg/git describe --exact-match '$(_gitnode_)' 2>/dev/null)
+-@MK@      ifeq ($(_tag_),)
+-@MK@        DEFS += -DBRANCH_VERSION='"$(shell hg log --template='{activebookmark}' -r .)-$(shell git --git-dir=../.hg/git rev-parse --short '$(_gitnode_)')-$(shell git --git-dir=../.hg/git rev-list '$(_gitnode_)' --count)"'
+-@MK@      endif
+-@MK@    endif
+-@MK@  endif
+-@MK@endif
+-
+ # gabc files
+ gregorio__GREGORIO_EXE_SUFFIX__SOURCES += \
+ 	gabc/gabc-elements-determination.c gabc/gabc-write.c \
+-- 
+2.45.2
+