Index: Makefile
===================================================================
--- Makefile	(revision 351333)
+++ Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cyassl
-PORTVERSION=	2.9.0
+PORTVERSION=	2.9.4
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.yassl.com/
 
@@ -10,7 +10,7 @@
 
 LICENSE=	GPLv2
 
-USES=		zip
+USES=		pathfix zip
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking \
Index: distinfo
===================================================================
--- distinfo	(revision 351333)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (cyassl-2.9.0.zip) = e0b9ea0a440d7a31bfe9ab7eea82bfb7ddeb32c5e840a4764e83318654ea69ed
-SIZE (cyassl-2.9.0.zip) = 1922895
+SHA256 (cyassl-2.9.4.zip) = 4c68a6157f3a197f6fbd07456506e0b4a65a38ec08441fb22265d188b69a49be
+SIZE (cyassl-2.9.4.zip) = 1935752
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 351333)
+++ pkg-plist	(working copy)
@@ -3,39 +3,10 @@
 lib/libcyassl.la
 lib/libcyassl.so
 lib/libcyassl.so.5
-lib/pkgconfig/cyassl.pc
-include/cyassl/openssl/asn1.h
-include/cyassl/openssl/bio.h
-include/cyassl/openssl/bn.h
-include/cyassl/openssl/conf.h
-include/cyassl/openssl/crypto.h
-include/cyassl/openssl/des.h
-include/cyassl/openssl/dh.h
-include/cyassl/openssl/dsa.h
-include/cyassl/openssl/ec.h
-include/cyassl/openssl/ecdsa.h
-include/cyassl/openssl/engine.h
-include/cyassl/openssl/err.h
-include/cyassl/openssl/evp.h
-include/cyassl/openssl/hmac.h
-include/cyassl/openssl/lhash.h
-include/cyassl/openssl/md4.h
-include/cyassl/openssl/md5.h
-include/cyassl/openssl/ocsp.h
-include/cyassl/openssl/opensslconf.h
-include/cyassl/openssl/opensslv.h
-include/cyassl/openssl/ossl_typ.h
-include/cyassl/openssl/pem.h
-include/cyassl/openssl/pkcs12.h
-include/cyassl/openssl/rand.h
-include/cyassl/openssl/ripemd.h
-include/cyassl/openssl/rsa.h
-include/cyassl/openssl/sha.h
-include/cyassl/openssl/ssl.h
-include/cyassl/openssl/stack.h
-include/cyassl/openssl/ui.h
-include/cyassl/openssl/x509.h
-include/cyassl/openssl/x509v3.h
+libdata/pkgconfig/cyassl.pc
+include/cyassl/callbacks.h
+include/cyassl/certs_test.h
+include/cyassl/crl.h
 include/cyassl/ctaocrypt/aes.h
 include/cyassl/ctaocrypt/arc4.h
 include/cyassl/ctaocrypt/asn.h
@@ -50,7 +21,8 @@
 include/cyassl/ctaocrypt/dh.h
 include/cyassl/ctaocrypt/dsa.h
 include/cyassl/ctaocrypt/ecc.h
-include/cyassl/ctaocrypt/error.h
+include/cyassl/ctaocrypt/error-crypt.h
+include/cyassl/ctaocrypt/fips_test.h
 include/cyassl/ctaocrypt/hc128.h
 include/cyassl/ctaocrypt/hmac.h
 include/cyassl/ctaocrypt/integer.h
@@ -76,11 +48,40 @@
 include/cyassl/ctaocrypt/tfm.h
 include/cyassl/ctaocrypt/types.h
 include/cyassl/ctaocrypt/visibility.h
-include/cyassl/callbacks.h
-include/cyassl/certs_test.h
-include/cyassl/crl.h
-include/cyassl/error.h
+include/cyassl/error-ssl.h
 include/cyassl/ocsp.h
+include/cyassl/openssl/asn1.h
+include/cyassl/openssl/bio.h
+include/cyassl/openssl/bn.h
+include/cyassl/openssl/conf.h
+include/cyassl/openssl/crypto.h
+include/cyassl/openssl/des.h
+include/cyassl/openssl/dh.h
+include/cyassl/openssl/dsa.h
+include/cyassl/openssl/ec.h
+include/cyassl/openssl/ecdsa.h
+include/cyassl/openssl/engine.h
+include/cyassl/openssl/err.h
+include/cyassl/openssl/evp.h
+include/cyassl/openssl/hmac.h
+include/cyassl/openssl/lhash.h
+include/cyassl/openssl/md4.h
+include/cyassl/openssl/md5.h
+include/cyassl/openssl/ocsp.h
+include/cyassl/openssl/opensslconf.h
+include/cyassl/openssl/opensslv.h
+include/cyassl/openssl/ossl_typ.h
+include/cyassl/openssl/pem.h
+include/cyassl/openssl/pkcs12.h
+include/cyassl/openssl/rand.h
+include/cyassl/openssl/ripemd.h
+include/cyassl/openssl/rsa.h
+include/cyassl/openssl/sha.h
+include/cyassl/openssl/ssl.h
+include/cyassl/openssl/stack.h
+include/cyassl/openssl/ui.h
+include/cyassl/openssl/x509.h
+include/cyassl/openssl/x509v3.h
 include/cyassl/options.h
 include/cyassl/sniffer.h
 include/cyassl/sniffer_error.h
@@ -87,7 +88,6 @@
 include/cyassl/ssl.h
 include/cyassl/test.h
 include/cyassl/version.h
-@dirrmtry lib/pkgconfig
 @dirrm include/cyassl/openssl
 @dirrm include/cyassl/ctaocrypt
 @dirrm include/cyassl