diff --git a/acl-2.2.39-path_max.patch b/acl-2.2.39-path_max.patch
index 4f4e7c3..4bb2fa8 100644
--- a/acl-2.2.39-path_max.patch
+++ b/acl-2.2.39-path_max.patch
@@ -18,7 +18,7 @@
 +	  bytes for "#file:". Not a good solution but for now it is the 
 +	  best I can do without too much impact on the code. [tw]
 +	*/
-+	char linebuf[PATH_MAX+6];
++	char linebuf[(4*PATH_MAX)+6];
  	char *cp;
  	char *p;
  	int comments_read = 0;
diff --git a/acl.spec b/acl.spec
index 4f69a21..4f0db50 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.39
-Release: 9%{?dist}
+Release: 10%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
@@ -107,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Thu Sep 20 2007 Jiri Moskovcak <jmoskovc@redhat.com> 2.2.39-10
+- Rewriten path_max patch to support long UTF8 names
+- Resolves #287701, #183181
+
 * Fri Aug 31 2007 Steve Dickson <steved@redhat.com> - 2.2.39-9
 - Removed NFS4 ACL patch since it was rejected by upstream.