diff --git a/package/base/openssl/openssl.conf b/package/base/openssl/openssl.conf
index f2ec13e42..167d08514 100644
--- a/package/base/openssl/openssl.conf
+++ b/package/base/openssl/openssl.conf
@@ -44,9 +44,8 @@ openssl_main()
 	esac
 
 	./Configure --prefix=/usr --openssldir=/etc/ssl $trg shared
-	mkdir -p $root/etc/ssl ; rm -rf $docdir/*
-	rm -rf $root/etc/ssl/man $root/etc/ssl/lib $root/etc/ssl/include
-	cp -r doc $docdir ; mkdir $docdir/man ; ln -s $docdir/man $root/etc/ssl/man
+	mkdir -p $root/etc/ssl ; rm -rf $root/etc/ssl/{man,lib,include}
+	rm -rf $docdir/* ; cp -r doc $docdir
 	ln -s /usr/lib /usr/include $root/etc/ssl/
 	
 	# the openssl makefile expects the 'r' mode to be passed
@@ -55,6 +54,16 @@ openssl_main()
 
 	eval "$MAKE $makeopt all"
 	eval "$MAKE INSTALL_PREFIX=$root install"
+
+	# these three conflict with shadow resp. man-pages
+	mv -v $root/etc/ssl/man/man1/passwd.1 $root/usr/share/man/man1/openssl_passwd.1
+	mv -v $root/etc/ssl/man/man3/err.3 $root/usr/share/man/man3/openssl_err.3
+	mv -v $root/etc/ssl/man/man3/rand.3 $root/usr/share/man/man3/openssl_rand.3
+	find $root/etc/ssl/man -type f \
+	| while read x ; do
+		mv -v "$x" $root/usr/share/"${x#$root/etc/ssl/}"
+	done
+	rm -rf $root/etc/ssl/man
 }
 
 custmain="openssl_main"