diff --git a/dev-libs/openssl/OpenSSL.OptionalPackageDescription b/dev-libs/openssl/OpenSSL.OptionalPackageDescription
deleted file mode 100644
index 1deb64ec4..000000000
--- a/dev-libs/openssl/OpenSSL.OptionalPackageDescription
+++ /dev/null
@@ -1,5 +0,0 @@
-Package:	OpenSSL
-Version:	0.9.8k
-Copyright:	1995-1998 Eric Young , 1998-2008 The OpenSSL Project.
-License:	OpenSSL
-URL:		http://www.openssl.org/
diff --git a/dev-libs/openssl/openssl-0.9.8m.bep b/dev-libs/openssl/openssl-0.9.8m.bep
new file mode 100644
index 000000000..346569b00
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.8m.bep
@@ -0,0 +1,17 @@
+DESCRIPTION="openssl" 
+HOMEPAGE="http://www.openssl.org/" 
+SRC_URI="http://www.openssl.org/source/openssl-0.9.8m.tar.gz"
+CHECKSUM_MD5="898bf125370926d5f692a2201124f8ec"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="zlib"
+BUILD {
+	cd openssl-0.9.8m
+	config --prefix=/boot/common zlib shared
+	make
+}
+
+INSTALL {
+	cd openssl-0.9.8m
+	make install
+}
diff --git a/dev-libs/openssl/openssl.OptionalPackageDescription b/dev-libs/openssl/openssl.OptionalPackageDescription
index db78d68d2..79766df1d 100644
--- a/dev-libs/openssl/openssl.OptionalPackageDescription
+++ b/dev-libs/openssl/openssl.OptionalPackageDescription
@@ -1,5 +1,5 @@
 Package:	OpenSSL
-Version:	0.9.8l
-Copyright:	1995-1998 Eric Young , 1998-2009 The OpenSSL Project.
-License:	BSD-style Open Source licenses.
+Version:	0.9.8m
+Copyright:	1995-1998 Eric Young , 1998-2010 The OpenSSL Project.
+License:	OpenSSL
 URL:		http://www.openssl.org/
diff --git a/dev-libs/openssl/patches/openssl-0.9.8m.patch b/dev-libs/openssl/patches/openssl-0.9.8m.patch
new file mode 100644
index 000000000..7b74cc2fe
--- /dev/null
+++ b/dev-libs/openssl/patches/openssl-0.9.8m.patch
@@ -0,0 +1,54 @@
+diff -urN openssl-0.9.8m/Configure openssl-0.9.8m-haiku/Configure
+--- openssl-0.9.8m/Configure	2009-11-05 12:07:06.000000000 +0000
++++ openssl-0.9.8m-haiku/Configure	2009-11-07 16:59:19.000000000 +0000
+@@ -545,6 +545,9 @@
+ ##### Compaq Non-Stop Kernel (Tandem)
+ "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",
+ 
++##### 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)",
++
+ );
+ 
+ my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
+diff -urN openssl-0.9.8m/Makefile.shared openssl-0.9.8m-haiku/Makefile.shared
+--- openssl-0.9.8m/Makefile.shared	2008-09-17 15:56:40.000000000 +0000
++++ openssl-0.9.8m-haiku/Makefile.shared	2009-11-07 16:59:19.000000000 +0000
+@@ -552,10 +552,10 @@
+ symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
+ 
+ # 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 -urN openssl-0.9.8m/config openssl-0.9.8m-haiku/config
+--- openssl-0.9.8m/config	2009-02-16 08:43:41.000000000 +0000
++++ openssl-0.9.8m-haiku/config	2009-11-07 16:59:19.000000000 +0000
+@@ -126,6 +126,10 @@
+ 	echo "${MACHINE}-dg-dgux"; exit 0
+ 	;;
+ 
++    Haiku:*:BePC)
++    echo "i586-pc-haiku"; exit 0
++    ;;
++
+     HI-UX:*)
+ 	echo "${MACHINE}-hi-hiux"; exit 0
+ 	;;
+@@ -761,6 +765,8 @@
+ 	    options="$options no-asm"
+ 	fi
+ 	;;
++     i586-*-haiku) OUT="haiku-x86" ;;
++
+   # these are all covered by the catchall below
+   # *-dgux) OUT="dgux" ;;
+   mips-sony-newsos4) OUT="newsos4-gcc" ;;