diff --git a/dev-util/cppunit/cppunit-1.12.1.recipe b/dev-util/cppunit/cppunit-1.12.1.recipe
index ccad5254c..c463ac254 100644
--- a/dev-util/cppunit/cppunit-1.12.1.recipe
+++ b/dev-util/cppunit/cppunit-1.12.1.recipe
@@ -1,23 +1,83 @@
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing" 
-HOMEPAGE="http://cppunit.sourceforge.net/" 
-SRC_URI="http://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/cppunit-1.12.1.tar.gz/download"
+SUMMARY="C++ unit testing framework"
+DESCRIPTION="
+CppUnit is a C++ unit testing framework. It started its life as a port of \
+JUnit to C++ by Michael Feathers.
+"
+HOMEPAGE="http://cppunit.sourceforge.net/"
+SRC_URI="http://downloads.sourceforge.net/cppunit/cppunit-1.12.1.tar.gz"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="
+	Michael Feathers <mfeathers@objectmentor.com>
+	Jerome Lacoste <lacostej@altern.org>
+	E. Sommerlade <eric@sommerla.de>
+	Baptiste Lepilleur <gaiacrtn@free.fr> <blep@sourceforge.net>
+	Bastiaan Bakker <bastiaan.bakker@lifeline.nl>
+	Steve Robbins <smr99@sourceforge.net>
+	"
+CHECKSUM_SIZE="762803"
 CHECKSUM_MD5="bd30e9cf5523cdfc019b94f5e1d7fd19"
+CHECKSUM_RMD160="c5f38b1d201afcba7913f2b53fb7558add3d21f5"
+CHECKSUM_SHA512="7af3569d028d5fa49106ece281f478cc2757cc5deca8c2512406796a7dbd6473928a1e730f28880467d19c6e59b31e55bf4f92f5cf2498a3a875ab32c5b2a081"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86 x86_gcc2"
+
+SOURCE_DIR="$portName-$portVersion"
+
+PROVIDES="
+	cppunit = $portVersion compat >= 1.12
+	cmd:cppunit_config = $portVersion compat >= 1.12
+	cmd:DllPlugInTester = $portVersion compat >= 1.12
+	lib:libcppunit = $portVersion compat >= 1.12
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:libtoolize
+	cmd:autoreconf
+	cmd:g++
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+PATCH()
+{
+	# change obsolete macro
+	sed -i -e 's#AM_CONFIG_HEADER(\(.*\))#AC_CONFIG_HEADERS([\1])#g' \
+		configure.in
+}
+
 BUILD()
 {
-	cd cppunit-1.12.1
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
+
+	# there seems to be a problem with dirname
+	sed -i -e 's#\/\* automatically generated \*\/#$ac_prefix_conf_INP#g' \
+		configure
+
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd cppunit-1.12.1
 	make install
+
+	prepareInstalledDevelLib libcppunit
+	fixPkgconfig
+
+	packageEntries devel $developDir
 }
 
-LICENSE="GNU LGPL v2.1"
+PROVIDES_devel="
+	cppunit_devel = $portVersion
+	devel:libcppunit = $portVersion compat >= 1.12
+	"
+REQUIRES_devel="
+	cppunit == $portVersion base
+	"