diff --git a/app-admin/pwgen/pwgen-2.06.recipe b/app-admin/pwgen/pwgen-2.06.recipe
index 36dcee239..9eb2f0e34 100644
--- a/app-admin/pwgen/pwgen-2.06.recipe
+++ b/app-admin/pwgen/pwgen-2.06.recipe
@@ -1,19 +1,62 @@
-DESCRIPTION="pwgen - password generator" 
+SUMMARY="pwgen - password generator"
+DESCRIPTION="
+The pwgen program generates passwords which are designed to be easily
+memorized by humans, while being as secure as possible.  Human-
+memorable passwords are never going to be as secure as completely
+completely random passwords.  In particular, passwords generated by
+pwgen without the -s option should not be used in places where the
+password could be attacked via an off-line brute-force attack.   On
+the other hand, completely randomly generated  passwords have a
+tendency to be written down, and are subject to being compromised in
+that fashion.
+
+The pwgen program is designed to be used both interactively, and in
+shell scripts.  Hence, its default behavior differs depending on
+whether the standard output is a tty device or a pipe to another
+program.  Used interactively, pwgen will display a screenful of
+passwords, allowing the user to pick a single password, and then
+quickly erase the screen.  This prevents someone from being able to
+'shoulder surf' the user's chosen password.
+"
 HOMEPAGE="http://sourceforge.net/projects/pwgen" 
-SRC_URI="http://voxel.dl.sourceforge.net/sourceforge/pwgen/pwgen-2.06.tar.gz"
+SRC_URI="http://sourceforge.net/projects/pwgen/files/pwgen/2.06/pwgen-2.06.tar.gz"
 CHECKSUM_MD5="935aebcbe610fbc9de8125e7b7d71297"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+COPYRIGHT="2001-2006 by Theodore Ts'o
+	2001-2003  Christophe Devine
+	2005 by Olivier Guerrier
+	"
+
+LICENSE="GNU GPL v2"
+
+PROVIDES="
+	pwgen = $portVersion
+	cmd:pwgen = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:make
+	cmd:gcc
+	"
+
 BUILD()
 {
-	cd pwgen-2.06
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	autoconf
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd pwgen-2.06
 	make install
 }