diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 5a96822448..aa4a996d1a 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -2,7 +2,7 @@
 pkgname=openssl
 _openssl_version=1.0.1
 version=${_openssl_version}g
-revision=1
+revision=2
 bootstrap=yes
 short_desc="Secure Socket Layer and cryptographic library - runtime utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -64,6 +64,9 @@ do_install() {
 		ln -sf ${_solib_}.${_sover} ${_solib_}.1
 		ln -sf ${_solib_}.${_sover} ${_solib_}
 	done
+	# Rename conflicting manpages.
+	mv ${DESTDIR}/usr/share/man/man1/passwd.1 mv \
+		${DESTDIR}/usr/share/man/man1/openssl-passwd.1
 }
 
 openssl-devel_package() {