diff --git a/net-libs/gnutls/gnutls-2.8.6.recipe b/net-libs/gnutls/gnutls-2.8.6.recipe
index 5555e8d64..59f2e476e 100644
--- a/net-libs/gnutls/gnutls-2.8.6.recipe
+++ b/net-libs/gnutls/gnutls-2.8.6.recipe
@@ -1,33 +1,92 @@
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project" 
-HOMEPAGE="http://www.gnu.org/software/gnutls/" 
+SUMMARY="A TLS 1.0 and SSL 3.0 implementation for the GNU project" 
+DESCRIPTION="GnuTLS is a secure communications library implementing the SSL, \
+TLS and DTLS protocols and technologies around them. It provides a simple C \
+language application programming interface (API) to access the secure \
+communications protocols as well as APIs to parse and write X.509, PKCS #12, \
+OpenPGP and other required structures. It is aimed to be portable and \
+efficient with focus on security and interoperability.
+"
+HOMEPAGE="http://www.gnutls.org/"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnutls/gnutls-2.8.6.tar.bz2"
-CHECKSUM_MD5="eb0a6d7d3cb9ac684d971c14f9f6d3ba"
+CHECKSUM_SHA256="d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356"
 REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="dev-libs/libgcrypt >= 1.4.5
-		dev-libs/libgpg-error >= 1.7"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	gnutls = $portVersion
+	cmd:certtool
+	cmd:gnutls_cli
+	cmd:gnutls_cli_debug
+	cmd:gnutls_serv
+	cmd:psktool
+	cmd:srptool
+	lib:libgnutls_extra = 26.14.12 compat = 26
+	lib:libgnutls_openssl = 26.14.12 compat = 26
+	lib:libgnutls = 26.14.12 compat = 26
+	lib:libgnutlsxx = 26.14.12 compat = 26
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libgcrypt
+	lib:libgpg_error
+"
+
+BUILD_REQUIRES="
+	devel:libgcrypt
+	devel:libgpg_error
+"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:libtoolize
+	cmd:make
+"
+
+PROVIDES_devel="
+	gnutls_devel = $portVersion
+	devel:libgnutls_extra = 26.14.12 compat = 26
+	devel:libgnutls_openssl = 26.14.12 compat = 26
+	devel:libgnutls = 26.14.12 compat = 26
+	devel:libgnutlsxx = 26.14.12 compat = 26
+"
+
+REQUIRES_devel="
+	gnutls == $portVersion base
+"
+
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2009-2010 Free Software Fundation Inc.
 		2004-2008 Simon Josefsson
 		2000-2004 Nikos Mavrogiannopoulos"
+
 BUILD()
 {
-	cd gnutls-2.8.6
 	libtoolize --force --copy --install
-	autoreconf
-       cd lib
-	libtoolize --force --copy --install
-	autoreconf
+    cd lib
+		libtoolize --force --copy --install
 	cd ..
 	cd libextra
-	libtoolize --force --copy --install
-	autoreconf
+		libtoolize --force --copy --install
 	cd ..
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
 }
+
 INSTALL()
 {
-	cd gnutls-2.8.6
 	make install
+
+	prepareInstalledDevelLibs libgnutls-extra libgnutls-openssl libgnutls libgnutlsxx
+
+	packageEntries devel $developDir
+}
+
+TEST()
+{
+	make check
 }