diff --git a/app-arch/innoextract/innoextract-1.7.recipe b/app-arch/innoextract/innoextract-1.7.recipe
deleted file mode 100644
index 3a923eb02..000000000
--- a/app-arch/innoextract/innoextract-1.7.recipe
+++ /dev/null
@@ -1,64 +0,0 @@
-SUMMARY="A tool to unpack installers created by Inno Setup"
-DESCRIPTION="Inno Setup is a tool to create installers for Microsoft Windows \
-applications. innoextract allows to extract such installers under non-Windows \
-systems without running the actual installer using wine. innoextract currently\
- supports installers created by Inno Setup 1.2.10 to 5.6.0.
-In addition to standard Inno Setup installers, innoextract also supports some \
-modified Inno Setup variants including Martijn Laan's My Inno Setup Extensions\
- 3.0.6.1 as well as GOG.com's Inno Setup-based game installers."
-HOMEPAGE="https://constexpr.org/innoextract/"
-COPYRIGHT="2011-2018 Daniel Scharrer"
-LICENSE="Zlib"
-REVISION="2"
-SOURCE_URI="http://constexpr.org/innoextract/files/innoextract-$portVersion.tar.gz"
-CHECKSUM_SHA256="c1efb732f2bc3a80065c5f51a0d4ea6027aebf528c609d3f336aea2055d2f0a4"
-
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
-
-PROVIDES="
-	innoextract = $portVersion
-	cmd:innoextract = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libboost_filesystem
-	lib:libboost_iostreams
-	lib:libboost_program_options
-	lib:libboost_system
-	lib:libiconv
-	lib:liblzma
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libboost_filesystem
-	devel:libboost_iostreams
-	devel:libboost_program_options
-	devel:libboost_system
-	devel:libiconv
-	devel:liblzma
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc
-	cmd:make
-	"
-
-TEST_REQUIRES="
-	"
-
-BUILD()
-{
-	cmake . $cmakeDirArgs
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make check
-}
diff --git a/app-arch/innoextract/innoextract-1.8.recipe b/app-arch/innoextract/innoextract-1.8.recipe
new file mode 100644
index 000000000..79f4ebcb6
--- /dev/null
+++ b/app-arch/innoextract/innoextract-1.8.recipe
@@ -0,0 +1,65 @@
+SUMMARY="A tool to unpack installers created by Inno Setup"
+DESCRIPTION="Inno Setup is a tool to create installers for Microsoft Windows \
+applications. innoextract allows to extract such installers under non-Windows \
+systems without running the actual installer using wine. innoextract currently\
+ supports installers created by Inno Setup 1.2.10 to 5.6.0.
+In addition to standard Inno Setup installers, innoextract also supports some \
+modified Inno Setup variants including Martijn Laan's My Inno Setup Extensions\
+ 3.0.6.1 as well as GOG.com's Inno Setup-based game installers."
+HOMEPAGE="https://constexpr.org/innoextract/"
+COPYRIGHT="2011-2019 Daniel Scharrer"
+LICENSE="Zlib"
+REVISION="1"
+SOURCE_URI="http://constexpr.org/innoextract/files/innoextract-$portVersion.tar.gz"
+CHECKSUM_SHA256="5e78f6295119eeda08a54dcac75306a1a4a40d0cb812ff3cd405e9862c285269"
+
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	innoextract$secondaryArchSuffix = $portVersion
+	cmd:innoextract$commandSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libboost_filesystem$secondaryArchSuffix
+	lib:libboost_iostreams$secondaryArchSuffix
+	lib:libboost_program_options$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:liblzma$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libboost_filesystem$secondaryArchSuffix
+	devel:libboost_iostreams$secondaryArchSuffix
+	devel:libboost_program_options$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:liblzma$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	export CXXFLAGS="-D_BSD_SOURCE"
+	cmake . $cmakeDirArgs \
+		-DCMAKE_INSTALL_BINDIR=$commandBinDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}