diff --git a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
index 7cc6abf2c..40f347505 100644
--- a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
+++ b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
@@ -1,7 +1,5 @@
 SUMMARY="A viewer supporting PDF and DJVU Files"
-DESCRIPTION="
-DocumentViewer is a Viewer supporting PDF and DJVU Files.
-"
+DESCRIPTION="DocumentViewer is a viewer that supports PDF and DJVU Files."
 LICENSE="MIT"
 COPYRIGHT="2010-2012 Haiku, Inc"
 HOMEPAGE="http://haiku.bplaced.net/" 
@@ -9,6 +7,7 @@ SRC_URI="http://haiku.bplaced.net/DocumentViewer/sources/documentviewer-0.3.2.zi
 CHECKSUM_SHA256="92449ddaa6013443bb97920a373e07b7cc43786ce25780d94b02cb9d5f3dd7d3"
 REVISION="2"
 PATCHES="documentviewer-0.3.2.patchset"
+SOURCE_DIR="documentviewer-0.3.2"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -26,23 +25,23 @@ PROVIDES="
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libdjvulibre
-	lib:libfreetype
-	lib:libz
-	lib:libjpeg
-	lib:libopenjpeg
-	lib:libjbig2dec
+	lib:libdjvulibre$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libopenjpeg$secondaryArchSuffix
+	lib:libjbig2dec$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	devel:libdjvulibre
-	devel:libfitz
-	devel:libfreetype
-	devel:libz
-	devel:libjpeg
-	devel:libopenjpeg
-	devel:libjbig2dec
+	devel:libdjvulibre$secondaryArchSuffix
+	devel:libfitz$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libopenjpeg$secondaryArchSuffix
+	devel:libjbig2dec$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
@@ -51,8 +50,6 @@ BUILD_PREREQUIRES="
 	cmd:jam
 	"
 
-SOURCE_DIR="documentviewer-0.3.2"
-
 BUILD()
 {
 	# Yes, the source package actually contains binaries...