diff --git a/app-text/context/context-2025.06.12.ebuild b/app-text/context/context-2025.06.12.ebuild
index 4603039..ce26b55 100644
--- a/app-text/context/context-2025.06.12.ebuild
+++ b/app-text/context/context-2025.06.12.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
-TEXMFROOT=/usr/share/texmf-dist
-TEXMFBIN="${TEXMFROOT}/tex/texmf-linux-64/bin"
+TEXMFROOT=/usr/share/texmf-dist/tex
+TEXMFBIN="${TEXMFROOT}/texmf-linux-64/bin"
 
 DESCRIPTION="ConTeXt"
 HOMEPAGE="https://wiki.contextgarden.net
@@ -47,7 +47,7 @@ src_install(){
 
 	DESTDIR="${T}" cmake_build install
 
-	insinto "${TEXMFROOT}"
+	insinto "${TEXMFROOT}"/texmf-context
 
 	doins -r bibtex colors context context-readme.txt fonts metapost scripts tex web2c
 	
@@ -65,14 +65,8 @@ src_install(){
 
 	dosym -r "${TEXMFBIN}"/luametatex "${TEXMFBIN}"/mtxrun
 	dosym -r "${TEXMFBIN}"/luametatex "${TEXMFBIN}"/context
-
-	# Remove files which conflicts with dev-texlive/texlive-latex package
-	rm -f "${D}${TEXMFROOT}"/scripts/context/perl/mptopdf.pl
-	rm -f "${D}${TEXMFROOT}"/tex/context/base/mkii/supp-mis.mkii
-	rm -f "${D}${TEXMFROOT}"/tex/context/base/mkii/supp-mpe.mkii
-	rm -f "${D}${TEXMFROOT}"/tex/context/base/mkii/supp-pdf.mkii
-	rm -f "${D}${TEXMFROOT}"/tex/context/base/mkii/syst-tex.mkii
-	rm -f "${D}${TEXMFROOT}"/tex/generic/context/mptopdf/mptopdf.tex
+	dosym -r "${TEXMFROOT}"/texmf-context/web2c/contextcnf.lua \
+	         "${TEXMFROOT}"/texmf-context/web2c/texmfcnf.lua
 
 	greadme_stdin <<-EOF
 	If you plan to use mkIV and its 'context' command to generate your documents,