--- a/components/samba/samba/Makefile	Mon Jul 28 03:27:16 2014 -0700
+++ b/components/samba/samba/Makefile	Wed Jul 23 06:56:32 2014 -0700
@@ -162,7 +162,7 @@
 CONFIGURE_OPTIONS +=	--enable-shared=yes
 CONFIGURE_OPTIONS +=	--enable-static=no
 CONFIGURE_OPTIONS.32 +=	--with-static-modules=vfs_solarisacl
-CONFIGURE_OPTIONS.32 += --with-shared-modules=vfs_worm,vfs_zfsacl,vfs_samfs,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
+CONFIGURE_OPTIONS.32 += --with-shared-modules=vfs_worm,vfs_zfsacl,vfs_aio_pthread,vfs_samfs,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
 CONFIGURE_OPTIONS.64 +=	--with-static-modules=
 CONFIGURE_OPTIONS.64 += --with-shared-modules=
 CONFIGURE_OPTIONS +=	--with-readline

--- a/components/samba/samba/samba.p5m	Mon Jul 28 03:27:16 2014 -0700
+++ b/components/samba/samba/samba.p5m	Wed Jul 23 06:56:32 2014 -0700
@@ -239,7 +239,7 @@
 file path=usr/lib/samba/valid.dat
 file path=usr/lib/samba/vfs/acl_tdb.so
 file path=usr/lib/samba/vfs/acl_xattr.so
-file path=usr/lib/samba/vfs/aio_fork.so
+file path=usr/lib/samba/vfs/aio_pthread.so
 file path=usr/lib/samba/vfs/audit.so
 file path=usr/lib/samba/vfs/cacheprime.so
 file path=usr/lib/samba/vfs/cap.so
@@ -665,7 +665,7 @@
 file path=usr/share/samba/swat/help/manpages/testparm.1.html
 file path=usr/share/samba/swat/help/manpages/vfs_acl_tdb.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_acl_xattr.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_aio_fork.8.html
+file path=usr/share/samba/swat/help/manpages/vfs_aio_pthread.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_audit.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_cacheprime.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_cap.8.html