diff --git a/dev-libs/openssl/openssl-1.0.0p.recipe b/dev-libs/openssl/openssl-1.0.0p.recipe
deleted file mode 100644
index 2fc4ccd1b..000000000
--- a/dev-libs/openssl/openssl-1.0.0p.recipe
+++ /dev/null
@@ -1,120 +0,0 @@
-SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)"
-DESCRIPTION="
-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. The \
-project is managed by a worldwide community of volunteers that use the \
-Internet to communicate, plan, and develop the OpenSSL toolkit and its related \
-documentation.
-OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \
-and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \
-licence, which basically means that you are free to get and use it for \
-commercial and non-commercial purposes subject to some simple license \
-conditions.
-"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="http://www.openssl.org/source/openssl-$portVersion.tar.gz"
-CHECKSUM_SHA256="b745d11f19531620a2e7402167d54845d253f2da3e523c2d0950595aef104fc8"
-LICENSE="OpenSSL"
-COPYRIGHT="
-	1995-1998 Eric Young
-	1998-2012 The OpenSSL Project.
-	"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PATCHES="openssl-$portVersion.patchset"
-
-PROVIDES="
-	openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
-	lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0
-	lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
-	"
-if [ -z "$secondaryArchSuffix" ]; then
-	PROVIDES="$PROVIDES
-		cmd:c_rehash = $portVersion compat >= 1
-		cmd:openssl = $portVersion compat >= 1
-		"
-fi
-
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix >= 1.2.3
-	"
-if [ -n "$secondaryArchSuffix" ]; then
-	REQUIRES="$REQUIRES
-		openssl == $portVersion base
-		"
-fi
-
-BUILD_REQUIRES="
-	devel:libz$secondaryArchSuffix >= 1.2.3
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
-	cmd:make
-	cmd:perl >= 5
-	cmd:sed
-	"
-
-PATCH()
-{
-	# fix hard-coded perl path
-	sed -i 's,/usr/bin/perl,/bin/env perl,g' apps/tsget
-}
-
-BUILD()
-{
-	PERL="/bin/env perl" \
-	./config --prefix=$prefix --libdir=$relativeLibDir \
-		--openssldir=$dataRootDir/ssl \
-		zlib shared
-	make
-		# multi-job builds don't work correctly
-}
-
-INSTALL()
-{
-	make MANDIR=$manDir install
-
-	# move include dir to correct location
-	mkdir -p $(dirname $includeDir)
-	mv $prefix/include $includeDir
-
-	# prepare develop/lib
-	prepareInstalledDevelLibs libcrypto libssl
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		$developDir \
-		$manDir/man3
-
-	# Remove stuff we don't need in the secondary architecture base package,
-	# since we make it depend on the primary package.
-	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf $prefix/bin
-		rm -rf $dataRootDir/ssl
-		rm -rf $documentationDir
-	fi
-}
-
-TEST()
-{
-	make test
-}
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	openssl${secondaryArchSuffix}_devel = $portVersion
-	devel:libcrypto${secondaryArchSuffix} = $portVersion compat >= 1.0.0
-	devel:libssl${secondaryArchSuffix} = $portVersion compat >= 1.0.0
-	"
-REQUIRES_devel="
-	openssl${secondaryArchSuffix} == $portVersion base
-	"
diff --git a/dev-libs/openssl/openssl-1.0.0o.recipe b/dev-libs/openssl/openssl-1.0.0r.recipe
similarity index 97%
rename from dev-libs/openssl/openssl-1.0.0o.recipe
rename to dev-libs/openssl/openssl-1.0.0r.recipe
index c1cd4de04..cbf775ca4 100644
--- a/dev-libs/openssl/openssl-1.0.0o.recipe
+++ b/dev-libs/openssl/openssl-1.0.0r.recipe
@@ -15,7 +15,7 @@ conditions.
 "
 HOMEPAGE="http://www.openssl.org/"
 SRC_URI="http://www.openssl.org/source/openssl-$portVersion.tar.gz"
-CHECKSUM_SHA256="3b6f5aa4faa5190f29647cce6899b146f5968503c4188980c437ca6f11d8c8fd"
+CHECKSUM_SHA256="6538b33a1b95681c86ac8c5cc54d22835f0f0a5bf42ee6df4138c672d7e75f17"
 LICENSE="OpenSSL"
 COPYRIGHT="
 	1995-1998 Eric Young
diff --git a/dev-libs/openssl/patches/openssl-1.0.0p.patchset b/dev-libs/openssl/patches/openssl-1.0.0p.patchset
deleted file mode 100644
index ed643c50b..000000000
--- a/dev-libs/openssl/patches/openssl-1.0.0p.patchset
+++ /dev/null
@@ -1,102 +0,0 @@
-From 32832917dfac06f89f0ef56f088859b2ad555f3e Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Thu, 5 Jun 2014 15:47:46 +0000
-Subject: [PATCH 1/2] import patch from 1.0.0l
-
----
- Configure       |  4 ++++
- Makefile.shared |  8 ++++----
- config          | 11 +++++++++++
- 3 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/Configure b/Configure
-index cd849e3..0ff7727 100755
---- a/Configure
-+++ b/Configure
-@@ -583,6 +583,10 @@ my %table=(
- "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
- "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
- 
-+##### Haiku
-+"haiku-x86",	"gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"haiku-x86_64",	"gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-+
- );
- 
- my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
-diff --git a/Makefile.shared b/Makefile.shared
-index e753f44..cce510f 100644
---- a/Makefile.shared
-+++ b/Makefile.shared
-@@ -594,10 +594,10 @@ symlink.hpux:
- symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
- 
- # Compatibility targets
--link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
--link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu
--link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
--symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
-+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu
-+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu
-+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu
-+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu
- link_o.bsd-shared: link_o.bsd
- link_a.bsd-shared: link_a.bsd
- link_app.bsd-shared: link_app.bsd
-diff --git a/config b/config
-index 30e9a37..c2894cc 100755
---- a/config
-+++ b/config
-@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
- 	echo "${MACHINE}-dg-dgux"; exit 0
- 	;;
- 
-+    Haiku:*:BePC)
-+	echo "i586-pc-haiku"; exit 0
-+	;;
-+
-+    Haiku:*:*)
-+	echo "${MACHINE}-unknown-haiku"; exit 0
-+	;;
-+
-     HI-UX:*)
- 	echo "${MACHINE}-hi-hiux"; exit 0
- 	;;
-@@ -799,6 +807,9 @@ case "$GUESSOS" in
- 	    options="$options no-asm"
- 	fi
- 	;;
-+     i586-*-haiku) OUT="haiku-x86" ;;
-+     x86_64-*-haiku) OUT="haiku-x86_64" ;;
-+
-   # these are all covered by the catchall below
-   # *-dgux) OUT="dgux" ;;
-   mips-sony-newsos4) OUT="newsos4-gcc" ;;
--- 
-1.8.3.4
-
-From ad3b79df8dbaaafa1297204c2632e3bbb2a26489 Mon Sep 17 00:00:00 2001
-From: Alexander von Gluck IV <kallisti5@unixzen.com>
-Date: Sat, 21 Jun 2014 21:45:05 +0000
-Subject: [PATCH 2/2] openssl: Adjust default CA cert path
-
----
- crypto/cryptlib.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
-index fc249c5..273aa94 100644
---- a/crypto/cryptlib.h
-+++ b/crypto/cryptlib.h
-@@ -82,7 +82,7 @@ extern "C" {
- #ifndef OPENSSL_SYS_VMS
- #define X509_CERT_AREA		OPENSSLDIR
- #define X509_CERT_DIR		OPENSSLDIR "/certs"
--#define X509_CERT_FILE		OPENSSLDIR "/cert.pem"
-+#define X509_CERT_FILE		OPENSSLDIR "/CARootCertificates.pem"
- #define X509_PRIVATE_DIR	OPENSSLDIR "/private"
- #else
- #define X509_CERT_AREA		"SSLROOT:[000000]"
--- 
-1.8.3.4
-
diff --git a/dev-libs/openssl/patches/openssl-1.0.0o.patchset b/dev-libs/openssl/patches/openssl-1.0.0r.patchset
similarity index 79%
rename from dev-libs/openssl/patches/openssl-1.0.0o.patchset
rename to dev-libs/openssl/patches/openssl-1.0.0r.patchset
index ed643c50b..30435de49 100644
--- a/dev-libs/openssl/patches/openssl-1.0.0o.patchset
+++ b/dev-libs/openssl/patches/openssl-1.0.0r.patchset
@@ -1,13 +1,8 @@
-From 32832917dfac06f89f0ef56f088859b2ad555f3e Mon Sep 17 00:00:00 2001
+From d53368fb68399a8185df3a64632b0383a88d4ae4 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 5 Jun 2014 15:47:46 +0000
-Subject: [PATCH 1/2] import patch from 1.0.0l
+Subject: import patch from 1.0.0l
 
----
- Configure       |  4 ++++
- Makefile.shared |  8 ++++----
- config          | 11 +++++++++++
- 3 files changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/Configure b/Configure
 index cd849e3..0ff7727 100755
@@ -75,28 +70,26 @@ index 30e9a37..c2894cc 100755
 -- 
 1.8.3.4
 
-From ad3b79df8dbaaafa1297204c2632e3bbb2a26489 Mon Sep 17 00:00:00 2001
+
+From 5fc0496e6d6b6d5a6e08bd3948e3a3b77f1e99e7 Mon Sep 17 00:00:00 2001
 From: Alexander von Gluck IV <kallisti5@unixzen.com>
 Date: Sat, 21 Jun 2014 21:45:05 +0000
-Subject: [PATCH 2/2] openssl: Adjust default CA cert path
+Subject: openssl: Adjust default CA cert path
 
----
- crypto/cryptlib.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
-index fc249c5..273aa94 100644
+index c7ddc02..4875a63 100644
 --- a/crypto/cryptlib.h
 +++ b/crypto/cryptlib.h
 @@ -82,7 +82,7 @@ extern "C" {
- #ifndef OPENSSL_SYS_VMS
- #define X509_CERT_AREA		OPENSSLDIR
- #define X509_CERT_DIR		OPENSSLDIR "/certs"
--#define X509_CERT_FILE		OPENSSLDIR "/cert.pem"
-+#define X509_CERT_FILE		OPENSSLDIR "/CARootCertificates.pem"
- #define X509_PRIVATE_DIR	OPENSSLDIR "/private"
- #else
- #define X509_CERT_AREA		"SSLROOT:[000000]"
+ # ifndef OPENSSL_SYS_VMS
+ #  define X509_CERT_AREA          OPENSSLDIR
+ #  define X509_CERT_DIR           OPENSSLDIR "/certs"
+-#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
++#  define X509_CERT_FILE          OPENSSLDIR "/CARootCertificates.pem"
+ #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
+ # else
+ #  define X509_CERT_AREA          "SSLROOT:[000000]"
 -- 
 1.8.3.4