diff --git a/srcpkgs/openssl/libssl.template b/srcpkgs/openssl/libssl.template
index 06c7411e43..e179a3211f 100644
--- a/srcpkgs/openssl/libssl.template
+++ b/srcpkgs/openssl/libssl.template
@@ -6,8 +6,6 @@ long_desc="
 
  This package includes the OpenSSL libssl and libcrypto shared libraries."
 
-replaces="openssl<1.0.0a_2"
-
 do_install() {
 	vmove "usr/lib/lib*.so*" usr/lib
 }
diff --git a/srcpkgs/openssl/openssl-devel.template b/srcpkgs/openssl/openssl-devel.template
index 414d3b96b6..f90079d511 100644
--- a/srcpkgs/openssl/openssl-devel.template
+++ b/srcpkgs/openssl/openssl-devel.template
@@ -1,19 +1,14 @@
 # Template file for 'openssl-devel'.
 #
-depends="zlib-devel libssl"
+depends="zlib-devel libssl>=$version"
 short_desc="Secure Socket Layer and cryptographic library - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share/man
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/man/man3 usr/share/man
 }
diff --git a/srcpkgs/openssl/openssl.rshlibs b/srcpkgs/openssl/openssl.rshlibs
index c3c70afde1..800e971ee9 100644
--- a/srcpkgs/openssl/openssl.rshlibs
+++ b/srcpkgs/openssl/openssl.rshlibs
@@ -1,5 +1,3 @@
 libssl.so.1
 libcrypto.so.1
-libdl.so.2
-libz.so.1
 libc.so.6
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 302e682547..231b907ede 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,48 +1,57 @@
 # Template file for 'openssl'
 pkgname=openssl
-_openssl_version=1.0.0
-version=${_openssl_version}i
-homepage="http://www.openssl.org/"
-distfiles="${homepage}/source/$pkgname-$version.tar.gz"
-makedepends="zlib-devel"
-fulldepends="perl>=0"
-revision=2
+_openssl_version=1.0.1
+version=${_openssl_version}c
+revision=1
+fulldepends="perl"
+conf_files="/etc/ssl/openssl.cnf"
+subpackages="libssl openssl-devel"
 short_desc="Secure Socket Layer and cryptographic library - runtime utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
-checksum=548262d15777c504be1ab9bb8fabef1e14a3de54837a6593c8f403dd843d5e57
+homepage="http://www.openssl.org/"
+distfiles="https://www.openssl.org/source/$pkgname-$version.tar.gz"
+checksum=2a9eb3cd4e8b114eb9179c0d3884d61658e7d8e8bf4984798a5f5bd48e325ebe
 long_desc="
  The OpenSSL Project is a collaborative effort to develop a robust,
  commercial-grade, full-featured, and Open Source toolkit implementing the
  Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
  protocols as well as a full-strength general purpose cryptography library."
 
-disable_parallel_build=yes
-
-conf_files="/etc/ssl/openssl.cnf"
-subpackages="libssl openssl-devel"
 make_dirs="
 /etc/ssl/certs 0755 root root
 /etc/ssl/private 0750 root root"
 
-
 do_configure() {
-	./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-		zlib shared threads -Wa,--noexecstack
+	local _opts
+
+	if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+		_target="linux-x86_64"
+		_opts="enable-ec_nistp_64_gcc_128"
+	elif [ "${XBPS_MACHINE}" = "i686" ]; then
+		_target="linux-elf"
+	fi
+
+	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
+		shared zlib enable-md2 threads ${_opts} \
+		${_target} -Wa,--noexecstack \
+		"${CFLAGS}" "${LDFLAGS}" -DOPENSSL_NO_TLS1_2_CLIENT
 }
 
 do_build() {
-	make ${makejobs}
+	make
 }
 
 do_install() {
+	local _sover="1.0.0"
+
 	make INSTALL_PREFIX=${DESTDIR} MANDIR=/usr/share/man install
 
 	chmod 755 ${DESTDIR}/usr/lib/engines/*.so
 	for _solib_ in libssl.so libcrypto.so; do
-		chmod 755 ${DESTDIR}/usr/lib/${_solib_}.${_openssl_version}
+		chmod 755 ${DESTDIR}/usr/lib/${_solib_}.${_sover}
 		cd ${DESTDIR}/usr/lib && \
-			ln -sf ${_solib_}.${_openssl_version} ${_solib_}.1 && \
-			ln -sf ${_solib_}.${_openssl_version} ${_solib_}
+			ln -sf ${_solib_}.${_sover} ${_solib_}.1 && \
+			ln -sf ${_solib_}.${_sover} ${_solib_}
 	done
 }