diff --git a/app-text/ghostscript_gpl/ghostscript_gpl-10.01.1.recipe b/app-text/ghostscript_gpl/ghostscript_gpl-10.01.1.recipe
index 2a2fd1b00..6653bbce2 100644
--- a/app-text/ghostscript_gpl/ghostscript_gpl-10.01.1.recipe
+++ b/app-text/ghostscript_gpl/ghostscript_gpl-10.01.1.recipe
@@ -7,13 +7,13 @@ the conversion between PostScript and PDF files."
 HOMEPAGE="https://ghostscript.com/"
 COPYRIGHT="2001-2022 Artifex Software, Inc."
 LICENSE="AGPL-3.0"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${portVersion//./}/ghostscript-$portVersion.tar.xz"
 CHECKSUM_SHA256="c91193635aa2578f9508b8ba846106c1e3705fbd3fed5fd9a015f21b55f15d68"
 SOURCE_DIR="ghostscript-$portVersion"
 PATCHES="ghostscript_gpl-$portVersion.patchset"
 
-ARCHITECTURES="all !x86_gcc2 ?x86"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
@@ -84,7 +84,7 @@ PROVIDES_devel="
 
 REQUIRES_devel="
 	ghostscript_gpl$secondaryArchSuffix == $portVersion base
-"
+	"
 
 
 BUILD_REQUIRES="
@@ -151,8 +151,12 @@ INSTALL()
 {
 	make install
 	make install-sodebug
+
 	prepareInstalledDevelLib libgs
-	packageEntries devel $developDir
+
+	packageEntries devel \
+		$developDir \
+		$docDir
 }
 
 TEST()
diff --git a/app-text/ghostscript_gpl/ghostscript_gpl9-9.55.0.recipe b/app-text/ghostscript_gpl/ghostscript_gpl9-9.55.0.recipe
index 084dccc31..b98102e2a 100644
--- a/app-text/ghostscript_gpl/ghostscript_gpl9-9.55.0.recipe
+++ b/app-text/ghostscript_gpl/ghostscript_gpl9-9.55.0.recipe
@@ -9,13 +9,13 @@ This package contains only the libgs library for compatibility purposes."
 HOMEPAGE="https://ghostscript.com/"
 COPYRIGHT="2001-2021 Artifex Software, Inc."
 LICENSE="AGPL-3.0"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${portVersion//./}/ghostscript-$portVersion.tar.xz"
 CHECKSUM_SHA256="6ee3057773646d6a2c6d117eb53a17d6752feadc513828e4322f68b7b7789ff6"
 SOURCE_DIR="ghostscript-$portVersion"
 PATCHES="ghostscript_gpl-$portVersion.patchset"
 
-ARCHITECTURES="all !x86_gcc2 ?x86"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -49,8 +49,10 @@ PROVIDES_devel="
 
 REQUIRES_devel="
 	ghostscript_gpl9$secondaryArchSuffix == $portVersion base
-"
-
+	"
+CONFLICTS_devel="
+	ghostscript_gpl${secondaryArchSuffix}_devel
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel