diff --git a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
index 40b750dbb..f1ea0c856 100644
--- a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
+++ b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
@@ -1,25 +1,63 @@
-DESCRIPTION="DocumentViewer is a Viewer supporting PDF and DJVU Files." 
+SUMMARY="DocumentViewer is a Viewer supporting PDF and DJVU Files."
+DESCRIPTION="DocumentViewer is a Viewer supporting PDF and DJVU Files."
+LICENSE="MIT"
+COPYRIGHT="2010-2012 Haiku, Inc"
 HOMEPAGE="http://haiku.bplaced.net/" 
 SRC_URI="http://haiku.bplaced.net/DocumentViewer/sources/documentviewer-0.3.2.zip"
 CHECKSUM_MD5="1fddc4292ecb14f343eb18b0bf723b13"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/fitz >= 1.0 
-	media-libs/djvulibre >= 3.5.25"
-MESSAGE="This port only builds with gcc4."
+ARCHITECTURES="x86"
+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"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	documentviewer$secondaryArchSuffix = $portVersion
+	app:documentviewer = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libdjvulibre
+	lib:libfreetype
+	lib:libz
+	lib:libjpeg
+	lib:libopenjpeg
+	lib:libjbig2dec
+	"
+
+BUILD_REQUIRES="
+	devel:libdjvulibre
+	devel:libfitz
+	devel:libfreetype
+	devel:libz
+	devel:libjpeg
+	devel:libopenjpeg
+	devel:libjbig2dec
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:jam
+	cmd:g++$secondaryArchSuffix
+	"
+
+SOURCE_DIR="documentviewer-0.3.2"
 
 BUILD()
 {
-	cd documentviewer-0.3.2
 	jam
 }
 
 INSTALL()
 {
-	cd documentviewer-0.3.2
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/DocumentViewer
-	cp application/DocumentViewer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/DocumentViewer
-}
+	mkdir -p $appsDir
+	cp application/DocumentViewer $appsDir
 
-LICENSE="MIT"
-COPYRIGHT="2010-2012 Haiku, Inc"
+	addAppDeskbarSymlink $appsDir/DocumentViewer
+}