diff --git a/app-office/libreoffice/libreoffice-24.8.1.1.recipe b/app-office/libreoffice/libreoffice-24.8.1.1.recipe
index 6c2c54d34..0d1d4f072 100644
--- a/app-office/libreoffice/libreoffice-24.8.1.1.recipe
+++ b/app-office/libreoffice/libreoffice-24.8.1.1.recipe
@@ -71,7 +71,7 @@ libreofficeLanguages="af ar be bg bn br brx bs ca ca-valencia cs cy da de dsb el
 
 PROVIDES="
 	libreoffice$secondaryArchSuffix = $portVersion
-	app:LibreOffice$secondaryArchSuffix = $portVersion
+	app:LibreOffice = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -160,23 +160,29 @@ REQUIRES="
 
 ARCHITECTURES_galleries="any"
 PROVIDES_galleries="
-	libreoffice${secondaryArchSuffix}_galleries = $portVersion
+	libreoffice_galleries = $portVersion
 	"
 REQUIRES_galleries="
-	libreoffice$secondaryArchSuffix == $portVersion base
+	app:LibreOffice == $portVersion base
 	"
+REPLACES_galleries="
+	libreoffice_x86_galleries
+"
 
 for lang in $libreofficeLanguages; do
 typeset -l langcode
 langcode=${lang/-/_}
 eval "PROVIDES_${langcode}=\"\
-	libreoffice${secondaryArchSuffix}_${langcode} = $portVersion\
+	libreoffice_${langcode} = $portVersion\
 	\"; \
 REQUIRES_${langcode}=\"\
-	libreoffice$secondaryArchSuffix == $portVersion base\
+	app:LibreOffice == $portVersion base\
 	\"; \
 DESCRIPTION_${langcode}=\"Translations for the Libreoffice suite ($lang)\"; \
-ARCHITECTURES_${langcode}=\"any\""
+ARCHITECTURES_${langcode}=\"any\"; \
+REPLACES_${langcode}=\"\
+	libreoffice_x86_${langcode}\
+	\""
 done
 
 BUILD_REQUIRES="
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.recipe b/app-office/libreoffice/libreoffice-6.4.7.2.recipe
index 0b3afc835..116a8c001 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.recipe
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.recipe
@@ -17,7 +17,7 @@ and Open Source office suite on the market:
 HOMEPAGE="https://www.libreoffice.org/"
 COPYRIGHT="2000-2020 LibreOffice contributors"
 LICENSE="MPL v2.0"
-REVISION="15"
+REVISION="16"
 
 SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz"
 SOURCE_DIR="core-libreoffice-$portVersion"
@@ -52,7 +52,7 @@ libreofficeLanguages="af ar be bg bn br brx bs ca ca-valencia cs cy da de dsb el
 
 PROVIDES="
 	libreoffice$secondaryArchSuffix = $portVersion
-	app:LibreOffice$secondaryArchSuffix = $portVersion
+	app:LibreOffice = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -140,23 +140,29 @@ REQUIRES="
 
 ARCHITECTURES_galleries="any"
 PROVIDES_galleries="
-	libreoffice${secondaryArchSuffix}_galleries = $portVersion
+	libreoffice_galleries = $portVersion
 	"
 REQUIRES_galleries="
-	libreoffice$secondaryArchSuffix == $portVersion base
+	app:LibreOffice == $portVersion base
+	"
+REPLACES_galleries="
+	libreoffice_x86_galleries
 	"
 
 for lang in $libreofficeLanguages; do
 typeset -l langcode
 langcode=${lang/-/_}
 eval "PROVIDES_${langcode}=\"\
-	libreoffice${secondaryArchSuffix}_${langcode} = $portVersion\
+	libreoffice_${langcode} = $portVersion\
 	\"; \
 REQUIRES_${langcode}=\"\
-	libreoffice$secondaryArchSuffix == $portVersion base\
+	app:LibreOffice == $portVersion base\
 	\"; \
 DESCRIPTION_${langcode}=\"Translations for the Libreoffice suite ($lang)\"; \
-ARCHITECTURES_${langcode}=\"any\""
+ARCHITECTURES_${langcode}=\"any\"; \
+REPLACES_${langcode}=\"
+	libreoffice_x86_${langcode}\
+	\""
 done
 
 BUILD_REQUIRES="