diff --git a/app-text/libwpd/libwpd-0.9.9.recipe b/app-text/libwpd/libwpd-0.9.9.recipe
index a155e724b..5e2bf3fc6 100644
--- a/app-text/libwpd/libwpd-0.9.9.recipe
+++ b/app-text/libwpd/libwpd-0.9.9.recipe
@@ -15,13 +15,16 @@ COPYRIGHT="
 	Marc Maurer
 	Fridrich Strba
 	"
-REVISION="1"
-CHECKSUM_SIZE="882955"
-CHECKSUM_RMD160="dafe38980550c6deff71205cb15033411019d1e3"
-CHECKSUM_SHA512="ea17c26d3e888e5573649da0e3c5cfa6ab1af27908dffb064a8a7b26368c1b54b451f967e17ec52ab61bcd771ffe645213a9b8e0917b281a7f067f4750f076c0"
+REVISION="2"
+CHECKSUM_SHA256="6d894db0de312dbbef3359c14b967ee4d2bab4e70052c151f2a44dc39b0744b9"
 
-ARCHITECTURES="x86 !x86_gcc2 ?x86_64"
-SECONDARY_ARCHITECTURES="!x86 !x86_gcc2"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	$portName$secondaryArchSuffix = $portVersion
@@ -40,7 +43,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	pkgconfig >= 0.27
+	pkgconfig$secondaryArchSuffix >= 0.27
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/app-text/libwpg/libwpg-0.2.2.recipe b/app-text/libwpg/libwpg-0.2.2.recipe
index e64d30b73..68fd39386 100644
--- a/app-text/libwpg/libwpg-0.2.2.recipe
+++ b/app-text/libwpg/libwpg-0.2.2.recipe
@@ -15,14 +15,16 @@ COPYRIGHT="
 	Ariya Hidayat
 	Fridrich Strba
 	"
-REVISION="1"
-CHECKSUM_SIZE="469830"
-CHECKSUM_MD5="289fdfb5116761486c4b6d75704bbe2f"
-CHECKSUM_RMD160="927e9f8e9f4dbccc1c3755503a6678996388e09b"
-CHECKSUM_SHA512="1c6311593ffd93a4c64c6723bc4d8f806dca9975c7da1ae5cd0df6a4a756cd930291ef3f181f0875ae911a41468986af60f6727c3c46d2d56e42e3b69d5613f8"
+REVISION="2"
+CHECKSUM_SHA256="d5260dd46a9f2bb8ace90379b8afc47fe78f26048bb32abb982b900ef2fb2aa3"
 
-ARCHITECTURES="x86 !x86_gcc2 ?x86_64"
-SECONDARY_ARCHITECTURES="!x86 !x86_gcc2"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	$portName$secondaryArchSuffix = $portVersion
@@ -42,7 +44,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	pkgconfig >= 0.27
+	pkgconfig$secondaryArchSuffix >= 0.27
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/media-libs/libvisio/libvisio-0.0.31.recipe b/media-libs/libvisio/libvisio-0.0.31.recipe
new file mode 100644
index 000000000..cf57ff1e8
--- /dev/null
+++ b/media-libs/libvisio/libvisio-0.0.31.recipe
@@ -0,0 +1,101 @@
+SUMMARY="A library providing ability to interpret and import visio diagrams"
+DESCRIPTION="
+	Libvisio is library providing ability to interpret and import visio \
+	diagrams into various applications. You can find it being used in \
+	libreoffice.
+	"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libvisio/"
+SRC_URI="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.gz"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2.1
+	MPL v1.1
+	"
+COPYRIGHT="
+	2011 Fridrich Strba
+	2011 Eilidh McAdam
+	"
+REVISION="2"
+CHECKSUM_SHA256="4805b530eb79a9817d5daa3f069ef24959f439c0c0c80f12d30f9bc67b00cf90"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	$portName$secondaryArchSuffix = $portVersion
+	cmd:vsd2raw$secondaryArchSuffix
+	cmd:vsd2text$secondaryArchSuffix
+	cmd:vsd2xhtml$secondaryArchSuffix
+	cmd:vss2raw$secondaryArchSuffix
+	cmd:vss2text$secondaryArchSuffix
+	cmd:vss2xhtml$secondaryArchSuffix
+	lib:libvisio_0.0$secondaryArchSuffix = $portVersion compat >= 0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicui18n$secondaryArchSuffix
+	lib:libicuuc$secondaryArchSuffix
+	lib:libicudata$secondaryArchSuffix
+	lib:libwpd_0.9$secondaryArchSuffix
+	lib:libwpg_0.2$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	boost_devel$secondaryArchSuffix >= 1.36
+	devel:libicui18n$secondaryArchSuffix
+	devel:libicuuc$secondaryArchSuffix
+	devel:libicudata$secondaryArchSuffix
+	devel:libwpd_0.9$secondaryArchSuffix
+	devel:libwpg_0.2$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	pkgconfig$secondaryArchSuffix >= 0.27
+	cmd:aclocal
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:gperf
+	cmd:icu_config$secondaryArchSuffix
+	cmd:sed
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libvisio-0.0
+	fixPkgconfig
+
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libvisio${secondaryArchSuffix}_devel = $portVersion
+	devel:libvisio_0.0$secondaryArchSuffix = $portVersion compat >= 0
+	"
+REQUIRES_devel="
+	$portName$secondaryArchSuffix == $portVersion base
+	"