diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 06494633d3..e5bb4eddd4 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=3
+revision=4
 hostmakedepends="perl"
 makedepends="zlib-devel"
 short_desc="Secure Socket Layer and cryptographic library - runtime utilities"
@@ -53,9 +53,9 @@ do_install() {
 	chmod 755 ${DESTDIR}/usr/lib/engines/*.so
 	for _solib_ in libssl.so libcrypto.so; do
 		chmod 755 ${DESTDIR}/usr/lib/${_solib_}.${_sover}
-		cd ${DESTDIR}/usr/lib && \
-			ln -sf ${_solib_}.${_sover} ${_solib_}.1 && \
-			ln -sf ${_solib_}.${_sover} ${_solib_}
+		cd ${DESTDIR}/usr/lib
+		ln -sf ${_solib_}.${_sover} ${_solib_}.1
+		ln -sf ${_solib_}.${_sover} ${_solib_}
 	done
 
 	# Rename passwd.1, conflicts with shadow.
@@ -67,6 +67,15 @@ do_install() {
 		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() {
@@ -87,10 +96,7 @@ openssl_package() {
 		/etc/ssl/certs 0755 root root
 		/etc/ssl/private 0750 root root"
 	pkg_install() {
-		vmove usr/lib/engines
-		vmove usr/bin
-		vmove etc
-		vmove usr/share/man/man1
+		vmove all
 	}
 }