diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 677df1f07a..a814463a70 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=8.4.15
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-docdir=/usr/share/doc --with-openssl --with-python
  --with-pam --datadir=/usr/share/postgresql --enable-thread-safety
@@ -44,7 +44,7 @@ postgresql-doc_package() {
 postgresql-libs_package() {
 	short_desc="PostgreSQL shared libraries"
 	pkg_install() {
-		vmove "usr/lib/*.so*" usr/lib
+		vmove "usr/lib/*.so*"
         	for d in $(find ${DESTDIR}/usr/share/locale \
                    -type f -name libpq5\*); do
                 	mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
@@ -59,7 +59,7 @@ postgresql-libs-devel_package() {
 	pkg_install() {
 		for f in pg_config ecpg; do
 			vmove usr/bin/${f}
-			vmove "usr/share/man/man1/${f}*"
+			vmove "usr/share/man/man1/$(basename ${f})*"
 		done
 		vmove usr/include
 		vmove "usr/lib/*.a"
@@ -76,7 +76,7 @@ postgresql-plperl_package() {
 	depends="perl>=5.16 postgresql>=$version"
 	short_desc="PL/Perl procedural language for PostgreSQL"
 	pkg_install() {
-		vmove "usr/lib/postgresql/plperl*" usr/lib/postgresql
+		vmove "usr/lib/postgresql/plperl*"
 		for d in $(find ${DESTDIR}/usr/share/locale \
 		   -type f -name plperl\*); do
 			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
@@ -120,19 +120,19 @@ postgresql-client_package() {
 			dropuser pg_dump pg_dumpall pg_restore psql reindexdb \
 			vacuumdb; do
 			vmove usr/bin/${f}
-			vmove usr/share/man/man1/${f}.1
+			vmove usr/share/man/man1/$(basename ${f}).1
 		done
 		vmove usr/share/man/man7
 		for d in $(find ${DESTDIR}/usr/share/locale \
 		   -type f -name pgscripts\* -o \
 			   -name psql\* -o \
 			   -name pg_dump\*); do
-		mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-		mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-	done
-	mv ${DESTDIR}/usr/share/postgresql/psqlrc.* \
-		${PKGDESTDIR}/usr/share/postgresql
-}
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+		mv ${DESTDIR}/usr/share/postgresql/psqlrc.* \
+			${PKGDESTDIR}/usr/share/postgresql
+	}
 }
 
 postgresql_package() {
@@ -146,6 +146,7 @@ postgresql_package() {
 	postgres_homedir="/var/lib/${pkgname}"
 	postgres_shell="/bin/sh"
 	postgres_descr="PostgreSQL database server user"
+	depends="shadow"
 	pkg_install() {
 		vmove etc
 		vmove usr