diff --git a/ezjail-admin b/ezjail-admin
index e004b97..1526d83 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -790,7 +790,8 @@ setup|update)
     if [ "${ezjail_use_zfs}" = "YES" ]; then
       echo "ZFS: manage basejail and newjail"
       [ -d "${ezjail_jailfull}" ] && /sbin/zfs destroy -R "${ezjail_jailzfs}/fulljail"  && rm -rf "${ezjail_jailfull}"
-      /sbin/zfs create -p "${ezjail_jailzfs}/fulljail" || exerr "Error: Cannot create temporary Jail directory."
+      [ ! -d " ${ezjail_jaildir}" ] && /sbin/zfs create -p -o mountpoint=${ezjail_jaildir} ${ezjail_zfs_properties} ${ezjail_jailzfs}
+      /sbin/zfs create "${ezjail_jailzfs}/fulljail" || exerr "Error: Cannot create temporary Jail directory."
     else
       [ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}"
       mkdir -p "${ezjail_jailfull}" || exerr "Error: Cannot create temporary Jail directory."