diff --git a/bareos-clientonly/distinfo b/bareos-clientonly/distinfo
index f83da20854..afc0b0b369 100644
--- a/bareos-clientonly/distinfo
+++ b/bareos-clientonly/distinfo
@@ -24,7 +24,7 @@ SHA1 (patch-core_src_dird_dird__conf.cc) = b2d619d164acfa8949e8d10d45972dbce7f3b
 SHA1 (patch-core_src_dird_migrate.cc) = 694f86a15f532f9c13c387f1617be79342ba6e84
 SHA1 (patch-core_src_dird_restore.cc) = ab2243457a788b963ab2dfc6b03046539ee5d06a
 SHA1 (patch-core_src_dird_verify.cc) = b4f346a62358bffc09d5247d1636e352a2318eb0
-SHA1 (patch-core_src_findlib_acl.cc) = 135b306204ff7bc65216bca3904676707c2cd9af
+SHA1 (patch-core_src_findlib_acl.cc) = 79d47ae5f79e4e2629a0330787cc45b8347a42e2
 SHA1 (patch-core_src_findlib_find__one.cc) = 50eb6d289b7b2a7b33ee5828db31d03169833d9c
 SHA1 (patch-core_src_lib_scsi__lli.cc) = 09aa887d71009baa2ce2203c46c88a89097d6546
 SHA1 (patch-core_src_lib_version.c) = e5b54042969a6e2a9348abf0357730c3ba31b668
diff --git a/bareos/distinfo b/bareos/distinfo
index f83da20854..afc0b0b369 100644
--- a/bareos/distinfo
+++ b/bareos/distinfo
@@ -24,7 +24,7 @@ SHA1 (patch-core_src_dird_dird__conf.cc) = b2d619d164acfa8949e8d10d45972dbce7f3b
 SHA1 (patch-core_src_dird_migrate.cc) = 694f86a15f532f9c13c387f1617be79342ba6e84
 SHA1 (patch-core_src_dird_restore.cc) = ab2243457a788b963ab2dfc6b03046539ee5d06a
 SHA1 (patch-core_src_dird_verify.cc) = b4f346a62358bffc09d5247d1636e352a2318eb0
-SHA1 (patch-core_src_findlib_acl.cc) = 135b306204ff7bc65216bca3904676707c2cd9af
+SHA1 (patch-core_src_findlib_acl.cc) = 79d47ae5f79e4e2629a0330787cc45b8347a42e2
 SHA1 (patch-core_src_findlib_find__one.cc) = 50eb6d289b7b2a7b33ee5828db31d03169833d9c
 SHA1 (patch-core_src_lib_scsi__lli.cc) = 09aa887d71009baa2ce2203c46c88a89097d6546
 SHA1 (patch-core_src_lib_version.c) = e5b54042969a6e2a9348abf0357730c3ba31b668
diff --git a/bareos/patches/patch-core_src_findlib_acl.cc b/bareos/patches/patch-core_src_findlib_acl.cc
index 55bea7fee5..e75718031a 100644
--- a/bareos/patches/patch-core_src_findlib_acl.cc
+++ b/bareos/patches/patch-core_src_findlib_acl.cc
@@ -59,3 +59,21 @@ $NetBSD$
  /**
   * Define the supported ACL streams for these OSes
   */
+@@ -1091,6 +1092,8 @@ static bacl_exit_code freebsd_build_acl_
+       BErrNo be;
+ 
+       switch (errno) {
++        case EINVAL:
++	  /*FALLTHROUGH*/
+         case ENOENT:
+           return bacl_exit_ok;
+         default:
+@@ -1119,6 +1122,8 @@ static bacl_exit_code freebsd_build_acl_
+         BErrNo be;
+ 
+         switch (errno) {
++	  case EINVAL:
++	    /*FALLTHROUGH*/
+           case ENOENT:
+             return bacl_exit_ok;
+           default: