diff --git a/mkpkgng.in b/mkpkgng.in
index 7dd7064..e70a1b1 100644
--- a/mkpkgng.in
+++ b/mkpkgng.in
@@ -83,7 +83,8 @@ if ! expr "$version" : "[0-9]{1,}$" >/dev/null ; then
 	svnversion="$(svnversion 2>&1)"
 	svnversion=$(expr "$svnversion" : '\([0-9][0-9]*\)[A-Z]\{0,1\}$')
 	if [ -n "$svnversion" ] ; then
-		version="$version-r${svnversion}"
+		package="$package-$version"
+		version="r$svnversion"
 	fi
 fi
 
@@ -139,30 +140,23 @@ arch: $pkgabi
 www: @PACKAGE_URL@
 maintainer: @PACKAGE_BUGREPORT@
 prefix: @prefix@
-desc:
-  OpenPAM is an open source PAM library that focuses on simplicity,
-  correctness, and cleanliness.
-  
-  OpenPAM aims to gather the best features of Solaris PAM, XSSO and
-  Linux-PAM, plus some innovations of its own.  In areas where these
-  implementations disagree, OpenPAM tries to remain compatible with
-  Solaris, at the expense of XSSO conformance and Linux-PAM
-  compatibility.
-categories: local, security
+categories: [ local, security ]
 EOF
+cp "$srcdir/README" "$tmproot/+DESC"
 
 #
 # Generate file list
 #
 info "Generating the file list."
 (
-	echo "files:"
-	find -s "$tmproot" -type f | while read file ; do
+	echo "files: {"
+	find -s "$tmproot@prefix@" -type f | while read file ; do
 		[ "$file" = "$manifest" ] && continue
 		mode=$(stat -f%p "$file" | cut -c 3-)
 		file="${file#$tmproot}"
 		echo "  $file: { uname: root, gname: wheel, perm: $mode }"
 	done
+	echo "}"
 )>>"$manifest"
 
 #