diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 33ef60dd7efd..4abf3723d963 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	openssl
-PORTVERSION=	1.0.0
-DISTVERSIONSUFFIX=	h
-PORTREVISION=	10
+PORTVERSION=	1.0.1
+#DISTVERSIONSUFFIX=	a
+#PORTREVISION=	0
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/%SUBDIR%/ \
 		ftp://ftp.openssl.org/%SUBDIR%/ \
@@ -29,6 +29,7 @@ OPTIONS=	I386	"Use optimized assembler for 80386" off \
 		SSE2	"Use runtime SSE2 detection" on \
 		ASM	"Build with optimized Assembler" on \
 		ZLIB	"Build with zlib compression" on \
+		SCTP	"include SCTP support" on \
 		MD2	"Build with MD2 hash (obsolete)" on \
 		RC5	"Build with RC5 chipher (patented)" off \
 		RFC3779	"Build with RFC3779 support" off
@@ -1036,7 +1037,7 @@ MLINKS=	ASN1_OBJECT_new.3 ASN1_OBJECT_free.3 \
 OPENSSL_BASE_SONAME!=	readlink ${DESTDIR}/usr/lib/libcrypto.so || true
 OPENSSL_SHLIBVER_BASE=	${OPENSSL_BASE_SONAME:E}
 OPENSSL_BASE_SOPATH=	${OPENSSL_BASE_SONAME:H}
-OPENSSL_SHLIBVER?=	7
+OPENSSL_SHLIBVER?=	8
 
 .if defined(WITH_I386)
 .if ${ARCH} == "i386"
@@ -1071,6 +1072,12 @@ EXTRACONFIGURE+=	zlib zlib-dynamic
 EXTRACONFIGURE+=	no-zlib no-zlib-dynamic
 .endif
 
+.if !defined(WITHOUT_SCTP)
+EXTRACONFIGURE+=	sctp
+.else
+EXTRACONFIGURE+=	no-sctp
+.endif
+
 .if defined(WITH_MD2)
 EXTRACONFIGURE+=	enable-md2
 PLIST_SUB+=	WITH_MD2=""
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index eca61c9bcefa..57bc8445ad9b 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openssl-1.0.0h/openssl-1.0.0h.tar.gz) = 7e3dfc21aa57ed33ea673170053d1921322803b8a6a624a4f0d2e4c308bd418d
-SIZE (openssl-1.0.0h/openssl-1.0.0h.tar.gz) = 4048067
+SHA256 (openssl-1.0.1/openssl-1.0.1.tar.gz) = 4d9f0a594a9a89b28e1a04a9504c04104f6508ee27ad1e0efdd17a7a6dbbeeee
+SIZE (openssl-1.0.1/openssl-1.0.1.tar.gz) = 4453920
diff --git a/security/openssl/files/patch-Configure b/security/openssl/files/patch-Configure
index 44cf1069a961..cbb673a6854b 100644
--- a/security/openssl/files/patch-Configure
+++ b/security/openssl/files/patch-Configure
@@ -1,16 +1,16 @@
---- Configure.orig	2010-06-06 10:43:52.000000000 +0200
-+++ Configure	2010-06-06 10:43:52.000000000 +0200
-@@ -147,7 +147,7 @@
+--- Configure.orig	2012-03-03 14:18:06.000000000 +0100
++++ Configure	2012-03-25 19:22:16.000000000 +0200
+@@ -150,7 +150,7 @@
  # which has to be accompanied by explicit -D_THREAD_SAFE and
  # sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which
  # seems to be sufficient?
 -my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT";
 +my $BSDthreads="$ENV{'PTHREAD_LIBS'} -D_REENTRANT $ENV{'PTHREAD_CFLAGS'}";
  
- #config-string	$cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib
+ #config-string	$cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $modes_obj : $engines_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib
  
-@@ -382,19 +382,20 @@
- "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
+@@ -407,19 +407,20 @@
+ "android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
  #### *BSD [do see comment about ${BSDthreads} above!]
 -"BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -31,7 +31,7 @@
  # triggered by RIPEMD160 code.
 -"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"BSD-sparc64",	"$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
 +"BSD-ia64",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
 +"BSD-x86_64",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 31329263ca03..170e0a2d425b 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -10,6 +10,7 @@ include/openssl/bn.h
 include/openssl/buffer.h
 include/openssl/camellia.h
 include/openssl/cast.h
+include/openssl/cmac.h
 include/openssl/cms.h
 include/openssl/comp.h
 include/openssl/conf.h
@@ -59,6 +60,8 @@ include/openssl/rsa.h
 include/openssl/safestack.h
 include/openssl/seed.h
 include/openssl/sha.h
+include/openssl/srp.h
+include/openssl/srtp.h
 include/openssl/ssl.h
 include/openssl/ssl2.h
 include/openssl/ssl23.h