diff --git a/dev-libs/chmlib/chmlib-0.40.recipe b/dev-libs/chmlib/chmlib-0.40.recipe
index 7b968a6df..877e0b6c4 100644
--- a/dev-libs/chmlib/chmlib-0.40.recipe
+++ b/dev-libs/chmlib/chmlib-0.40.recipe
@@ -1,32 +1,76 @@
+SUMMARY="A library for dealing with Microsoft ITSS/CHM format files."
 DESCRIPTION="
-CHMLIB is a library for dealing with Microsoft ITSS/CHM format files.
-" 
-HOMEPAGE="http://www.jedrea.com/chmlib/" 
-SRC_URI="http://www.jedrea.com/chmlib/chmlib-0.40.zip"
-CHECKSUM_MD5="a20d86103b8ab369e5b93506d5ffa802"
+chmlib is a small library designed for accessing MS ITSS files.  The ITSS file \
+format is used for Microsoft Html Help files (.chm), which have been the \
+predominant medium for software documentation from Microsoft during the past \
+several years, having superceded the previously used .hlp file format.
+Note that this is NOT the same as the OLE structured storage file format used \
+by MS Excel, Word, and so on.  Instead, it is a different file format which \
+fulfills a similar purpose.  Both file formats may be accessed via instances \
+of the IStorage COM interface, which is essentially an \"acts like a \
+filesystem\" interface.
+"
+HOMEPAGE="http://www.jedrea.com/chmlib/"
+COPYRIGHT="
+	2003 Jed Wing
+	"
+LICENSE="GNU LGPL v2.1"
+SRC_URI="http://www.jedrea.com/chmlib/chmlib-0.40.tar.gz"
+CHECKSUM_SHA256="512148ed1ca86dea051ebcf62e6debbb00edfdd9720cde28f6ed98071d3a9617"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	chmlib$secondaryArchSuffix = $portVersion compat >= 0
+	lib:libchm$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:sed
+	cmd:grep
+	cmd:gawk
+	"
+
 BUILD()
 {
-	cd chmlib-0.40
-	rm aclocal.m4
-	rm acinclude.m4
-	libtoolize --force --copy --install
+	libtoolize -fci
 	aclocal
 	sed -i 's/lpthread//g' configure.in Makefile.in src/Makefile.in
 	autoconf
 	automake
-	chmod 777 configure
-	./configure	--prefix=`finddir B_COMMON_DIRECTORY`
-	make
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd chmlib-0.40
 	make install
+
+	prepareInstalledDevelLibs libchm
+
+	# devel package
+	packageEntries devel \
+		$developDir
 }
 
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2003 Jed Wing"
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	chmlib${secondaryArchSuffix}_devel = $portVersion
+	devel:libchm${secondaryArchSuffix} = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	chmlib${secondaryArchSuffix} == $portVersion base
+	"