diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 170ca48..33d5c0e 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -25,8 +25,9 @@ SRCS+=	a_bitstr.c a_bool.c a_bytes.c a_d2i_fp.c a_digest.c \
 	a_dup.c a_enum.c a_gentm.c a_hdr.c a_i2d_fp.c a_int.c \
 	a_mbstr.c a_meth.c a_object.c a_octet.c a_print.c \
 	a_set.c a_sign.c a_strex.c a_strnid.c a_time.c a_type.c \
-	a_utctm.c a_utf8.c a_verify.c asn1_err.c asn1_lib.c \
-	asn1_gen.c asn1_par.c asn_moid.c asn_pack.c d2i_pr.c d2i_pu.c \
+	a_utctm.c a_utf8.c a_verify.c \
+	asn1_err.c asn1_lib.c asn1_gen.c asn1_par.c asn_mime.c \
+	asn_moid.c asn_pack.c d2i_pr.c d2i_pu.c \
 	evp_asn1.c f_enum.c f_int.c f_string.c i2d_pr.c i2d_pu.c \
 	n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c p8_pkey.c t_bitst.c \
 	t_crl.c t_pkey.c t_req.c t_spki.c t_x509.c t_x509a.c \
@@ -62,6 +63,10 @@ SRCS+=	buf_err.c buffer.c
 # cast
 SRCS+=	c_cfb64.c c_ecb.c c_enc.c c_ofb64.c c_skey.c
 
+# cms
+#SRCS+=	cms_att.c cms_att.c cms_cd.c cms_dd.c cms_enc.c cms_env.c cms_err.c \
+#	cms_ess.c cms_io.c cms_lib.c cms_sd.c cms_smime.c
+
 # comp
 SRCS+=	c_rle.c c_zlib.c comp_err.c comp_lib.c
 
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 80f7f4e..7d4188a 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -1,7 +1,7 @@
 # $FreeBSD: src/secure/lib/libcrypto/Makefile.inc,v 1.7.2.11 2003/02/20 15:07:32 nectar Exp $
 # $DragonFly: src/secure/lib/libcrypto/Makefile.inc,v 1.16 2007/10/25 04:13:39 pavalos Exp $
 
-OSSLVERSION=	0.9.8g
+OSSLVERSION=	0.9.8h
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl-0.9
 LCRYPTO_DOC=	${LCRYPTO_SRC}/doc
 
@@ -9,6 +9,10 @@ CFLAGS+=	-DTERMIOS -DANSI_SOURCE
 CFLAGS+=	-I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto \
 		-I${LCRYPTO_SRC}/crypto/engine -I${.OBJDIR}
 
+# disable them here
+CFLAGS+=	-DOPENSSL_NO_GMP
+CFLAGS+=	-DOPENSSL_NO_CMS
+
 .if !defined(WANT_IDEA)
 CFLAGS+=	-DOPENSSL_NO_IDEA
 .else