diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index e5bb4eddd42..efc6e97a283 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -2,7 +2,7 @@
 pkgname=openssl
 _openssl_version=1.0.1
 version=${_openssl_version}e
-revision=4
+revision=5
 hostmakedepends="perl"
 makedepends="zlib-devel"
 short_desc="Secure Socket Layer and cryptographic library - runtime utilities"
@@ -48,7 +48,7 @@ do_build() {
 do_install() {
 	local _sover="1.0.0"
 
-	make INSTALL_PREFIX=${DESTDIR} MANDIR=/usr/share/man install
+	make INSTALL_PREFIX=${DESTDIR} MANDIR=/usr/share/man MANSUFFIX=ssl install
 
 	chmod 755 ${DESTDIR}/usr/lib/engines/*.so
 	for _solib_ in libssl.so libcrypto.so; do
@@ -57,25 +57,6 @@ do_install() {
 		ln -sf ${_solib_}.${_sover} ${_solib_}.1
 		ln -sf ${_solib_}.${_sover} ${_solib_}
 	done
-
-	# Rename passwd.1, conflicts with shadow.
-	mv ${DESTDIR}/usr/share/man/man1/passwd.1 \
-		${DESTDIR}/usr/share/man/man1/openssl-passwd.1
-
-	# Rename rand.3 and err.3, conflicts with man-pages.
-	for f in rand err; do
-		mv ${DESTDIR}/usr/share/man/man3/${f}.3 \
-			${DESTDIR}/usr/share/man/man3/openssl-${f}.3
-	done
-
-	# Correct broken symlinks.
-	rm -f ${DESTDIR}/usr/share/man/man3/{DES_crypt,BUF_MEM_new,ASN1_STRING_type}.3
-	ln -sfr ${DESTDIR}/usr/share/man/man3/des.3 \
-		${DESTDIR}/usr/share/man/man3/DES_crypt.3
-	ln -sfr ${DESTDIR}/usr/share/man/man3/buffer.3 \
-		${DESTDIR}/usr/share/man/man3/BUF_MEM_new.3
-	ln -sfr ${DESTDIR}/usr/share/man/man3/ASN1_STRING_type.3 \
-		${DESTDIR}/usr/share/man/man3/ASN1_STRING_length.3
 }
 
 openssl-devel_package() {
@@ -84,6 +65,7 @@ openssl-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		vmove usr/share/man/man3
 	}
@@ -103,6 +85,6 @@ openssl_package() {
 libssl_package() {
 	short_desc="Secure Sockets Layer and Cryptographic library"
 	pkg_install() {
-		vmove "usr/lib/lib*.so*"
+		vmove "usr/lib/lib*.so.*"
 	}
 }