diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 146b7058dee1..96ec13bce540 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.50 2008/05/10 20:14:20 christos Exp $
+#	$NetBSD: Makefile,v 1.51 2008/05/26 16:51:07 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -75,7 +75,7 @@ INCS+=	aes.h asn1.h asn1_mac.h asn1t.h bio.h blowfish.h bn.h \
 	obj_mac.h objects.h ocsp.h opensslconf.h opensslv.h ossl_typ.h \
 	pem.h pem2.h pkcs12.h pkcs7.h rand.h rc2.h rc4.h ripemd.h \
 	rsa.h safestack.h sha.h stack.h store.h symhacks.h ts.h txt_db.h \
-	ui.h ui_compat.h x509.h x509_vfy.h x509v3.h pqueue.h
+	ui.h ui_compat.h x509.h x509_vfy.h x509v3.h pqueue.h camellia.h
 #	des_old.h 
 
 # IDEA - patented, but we install the header anyways
diff --git a/lib/libcrypto/camellia.inc b/lib/libcrypto/camellia.inc
new file mode 100644
index 000000000000..8e7031a48cd0
--- /dev/null
+++ b/lib/libcrypto/camellia.inc
@@ -0,0 +1,11 @@
+#       $NetBSD: camellia.inc,v 1.1 2008/05/26 16:51:07 christos Exp $
+
+.PATH:  ${OPENSSLSRC}/crypto/camellia
+
+CAMELLIA_SRCS = camellia.c cmll_misc.c \
+    cmll_ecb.c cmll_cbc.c cmll_cfb.c cmll_ofb.c cmll_ctr.c
+SRCS += ${CAMELLIA_SRCS}
+
+.for cryptosrc in ${CAMELLIA_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/camellia
+.endfor
diff --git a/lib/libcrypto/shlib_version b/lib/libcrypto/shlib_version
index 3e4b1863f02c..6118c9138ee7 100644
--- a/lib/libcrypto/shlib_version
+++ b/lib/libcrypto/shlib_version
@@ -1,5 +1,5 @@
-#	$NetBSD: shlib_version,v 1.13 2008/05/09 21:52:18 christos Exp $
+#	$NetBSD: shlib_version,v 1.14 2008/05/26 16:51:07 christos Exp $
 #	Remember to update distrib/sets/lists/base/shl.* when changing
 #
 major=4
-minor=0
+minor=1
diff --git a/lib/libcrypto/srcs.inc b/lib/libcrypto/srcs.inc
index 6d2b46237b84..196c3e38dacc 100644
--- a/lib/libcrypto/srcs.inc
+++ b/lib/libcrypto/srcs.inc
@@ -1,10 +1,10 @@
-#	$NetBSD: srcs.inc,v 1.14 2008/05/09 21:52:18 christos Exp $
+#	$NetBSD: srcs.inc,v 1.15 2008/05/26 16:51:07 christos Exp $
 
 CRYPTOINCS= \
 	aes.inc asn1.inc bf.inc bio.inc bn.inc buffer.inc cast.inc \
 	cms.inc comp.inc conf.inc crypto.inc des.inc dh.inc dsa.inc dso.inc \
 	ec.inc ecdh.inc ecdsa.inc engine.inc err.inc evp.inc hmac.inc \
-	krb5.inc lhash.inc \
+	krb5.inc lhash.inc camellia.inc \
 	md2.inc md4.inc md5.inc objects.inc ocsp.inc pem.inc \
 	pkcs12.inc pkcs7.inc pqueue.inc rand.inc rc2.inc rc4.inc ripemd.inc \
 	rsa.inc sha.inc stack.inc store.inc txt_db.inc ts.inc ui.inc x509.inc \