diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe
index 0cfc5a444..73f843df9 100644
--- a/app-text/htmldoc/htmldoc-1.8.27.recipe
+++ b/app-text/htmldoc/htmldoc-1.8.27.recipe
@@ -1,36 +1,51 @@
-DESCRIPTION="HTMLDOC converts HTML files and web pages into index HTML, Adobe Postscript or Adobe Portable Documenrt Format files (pdf)." 
-HOMEPAGE="http://www.htmldoc.org" 
-SRC_URI="http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.zip"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="cb45c2823e282e3cd0cc05172e305072"
+SUMMARY="HTML file processor and converter" 
+DESCRIPTION="
+	HTMLDOC converts HTML files and web pages into index HTML, Adobe 
+	Postscript or Adobe Portable Document Format files (pdf).
+	" 
+HOMEPAGE="http://www.msweet.org/projects.php?Z1" 
+LICENSE="GNU GPL v2"
+COPYRIGHT="1997-2006 Easy Software Products"
+SRC_URI="http://www.msweet.org/files/project1/htmldoc-1.8.27-source.tar.bz2"
+CHECKSUM_MD5="35589e7b8fe9c54e11be87cd5aec4dcc"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	htmldoc = $portVersion compat >= 1.8
+	cmd:htmldoc = $portVersion compat >= 1.8
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
 BUILD()
 {
-	cd htmldoc-1.8.27
 	autoconf
 	chmod 755 configure
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--docdir=$COMMON_DOCS \
-		--mandir=$COMMON_DOCS/man
+    ./configure $configureDirArgs
 	make
 }
 
 INSTALL()
 {
-	cd htmldoc-1.8.27
 	make install
-}
 
-TEST()
-{
-	cd htmldoc-1.8.27
-#	make test
-#	make check
+	# move html documentation out of man-dir
+	mkdir -p $docDir
+	mv $manDir/doc/htmldoc/* $docDir/
+	rm -r $manDir/doc
 }
-
-#LICENSE=""
-#COPYRIGHT=""