diff --git a/media-libs/guilib/guilib-1.2.1.recipe b/media-libs/guilib/guilib-1.2.1.recipe
index f95c87490..94a1e60e3 100644
--- a/media-libs/guilib/guilib-1.2.1.recipe
+++ b/media-libs/guilib/guilib-1.2.1.recipe
@@ -1,29 +1,75 @@
-DESCRIPTION="GUIlib is a simple GUI framework for SDL" 
+SUMMARY="GUIlib is a simple GUI framework for SDL"
+DESCRIPTION="This is a very simple GUI library for SDL.  It provides some general widgets like button, scrollbar, image." 
 HOMEPAGE="http://www.libsdl.org/projects/GUIlib/" 
 SRC_URI="http://www.libsdl.org/projects/GUIlib/src/GUIlib-1.2.1.tar.gz"
 CHECKSUM_MD5="a0114b925d79d6c66161e24cbeaa88b1"
+LICENSE="Public Domain"
+COPYRIGHT="Public Domain"
+
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	guilib$secondaryArchSuffix = $portVersion compat >= 1.2
+	lib:libGUI$secondaryArchSuffix = 0.0.1 compat >= 0
+	lib:libGUI_1.2$secondaryArchSuffix = 0.0.1 compat >= 0
+	"
+
+REQUIRES="
+	haiku
+	lib:libsdl$secondaryArchSuffix
+	"
+	
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libsdl$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtool
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	"
+
+SOURCE_DIR="GUIlib-$portVersion"
+
 BUILD()
 {
-	cd GUIlib-1.2.1
-	rm aclocal.m4
-	rm acinclude.m4
+	rm -f aclocal.m4
+	rm -f acinclude.m4
 	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
 	libtoolize -fci
 	aclocal --install -I m4
 	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	make
+
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd GUIlib-1.2.1
 	make install
+	
+	prepareInstalledDevelLibs libGUI
+	fixPkgconfig
+	
+	# devel package
+	packageEntries devel \
+		$developDir
 }
 
-#LICENSE="Public Domain"
+# ----- devel package -----------------------------------------
+
+PROVIDES_devel="
+	guilib_devel${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
+	devel:guilib$secondaryArchSuffix = $portVersion compat >= 1.2
+	devel:libGUI$secondaryArchSuffix = 0.0.1 compat >= 0
+	devel:libGUI_1.2$secondaryArchSuffix = 0.0.1 compat >= 0
+	"
+REQUIRES_devel="
+	guilib$secondaryArchSuffix == $portVersion base
+	"