diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index d62de00ea..c6b1ab7b5 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -5,6 +5,9 @@
  - Mathieu Doidy: updated lftp (2.6.8) and added liferea
  - Dimitar Zhekov: bootdisk fixes
                    devfsd 'hardware' rewrite
+ - Chris Hamilton: pine exposing c-client.a and the possibility to modify the
+                   build type (e.g. to build with PAM support if available)
+ - pine cleanup
 
 *) 2003-10-17 (2.0.0-rc2 - 2.0.0-rc3)
 
diff --git a/package/base/pam/pkg_pine_post.conf b/package/base/pam/pkg_pine_post.conf
new file mode 100644
index 000000000..61b54ac30
--- /dev/null
+++ b/package/base/pam/pkg_pine_post.conf
@@ -0,0 +1,4 @@
+
+# build with PAM support
+BUILD_TYPE=lnp
+
diff --git a/package/base/pine/pine.conf b/package/base/pine/pine.conf
index 4df303d5c..d81003695 100644
--- a/package/base/pine/pine.conf
+++ b/package/base/pine/pine.conf
@@ -20,15 +20,26 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+# build with shadow only
+BUILD_TYPE=slx
+
 pine_main() {
-	./build slx SSLTYPE=unix SSLDIR=/usr
-	cp -v bin/* $root/usr/bin/
-	rm -rf $root/usr/share/doc/packages/$pkg/
-	cp -a doc/ $root/usr/share/doc/packages/$pkg/
-	cp -a imap/docs/ $root/usr/share/doc/packages/$pkg/imap/
-	cp imap/src/imapd/imapd.8c $root/usr/share/man/man8/imapd.8
-	cd $root/usr/share/doc/packages/$pkg/
-	mv pico.1 pilot.1 pine.1 $root/usr/share/man/man1/
+	./build $BUILD_TYPE SSLTYPE=unix SSLDIR=/usr
+	cp -fv bin/* $bindir/
+
+	mkdir -p $docdir/imap
+	rm -rf imap/docs/rfc/
+	cp -rfv imap/docs/ $docdir/imap/
+
+	# install the man-pages
+	cp -fv imap/src/imapd/imapd.8c $mandir/man8/imapd.8
+	mv -v doc/{pico.1,pilot.1,pine.1} $mandir/man1/
+
+	echo "Copying c-client library to $root/$prefix/lib"
+	cp -fv imap/c-client/c-client.a $libdir/
+	mkdir -p $includedir/c-client
+	cp -fv imap/c-client/*.h $includedir/c-client/
+	ln -sfv c-client.a $libdir/libc-client.a
 }
 
 var_append INSTALL_WRAPPER_FILTER "|" \