diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD
index a8ef108b7ff953164e9fc87b4eb1a1e7e2e5831b..0b252bb332703c9cbe202c58355f2e057ea2b3ac 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openssl
 pkgver=1.0.2g
-pkgrel=2
+pkgrel=3
 pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
 url="http://openssl.org"
 depends=
@@ -77,25 +77,30 @@ build() {
 		|| return 1
 
 	make && make build-shared || return 1
+
+	# Build standalone version c_rehash app, so the huge openssl
+	# binary is not mandatory requirement of ca-certificates
+	$CC $CFLAGS -I . -I include -L . "$_builddir"/apps/c_rehash.c -o c_rehash -lcrypto || return 1
 }
 
 package() {
 	cd "$_builddir"
 	make INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man MANSUFFIX=ssl install || return 1
 
-	# c_rehash compat link
-	ln -sf openssl "$pkgdir"/usr/bin/c_rehash
+	# c_rehash standalone app
+	install c_rehash "$pkgdir"/usr/bin/c_rehash || return 1
 }
 
 libcrypto() {
 	pkgdesc="Crypto library from openssl"
 
-	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
+	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin
 	for i in "$pkgdir"/usr/lib/libcrypto*; do
 		mv $i "$subpkgdir"/lib/
 		ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/}
 	done
-	mv "$pkgdir"/usr/lib/engines "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/engines "$subpkgdir"/usr/lib/ || return 1
+	mv "$pkgdir"/usr/bin/c_rehash "$subpkgdir"/usr/bin/ || return 1
 }
 
 libssl() {