diff --git a/apache2-mod_perl.changes b/apache2-mod_perl.changes
index 6d11987..3d87799 100644
--- a/apache2-mod_perl.changes
+++ b/apache2-mod_perl.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 26 15:19:55 UTC 2011 - coolo@novell.com
+
+- avoid a conflict between apache's LARGEFILE64_SOURCE and perl's
+  FILE_OFFSET_BITS=64 because the conflict isn't real and causes
+  the perl structures to be invalid if only the apache flags are used
+
 -------------------------------------------------------------------
 Wed May 18 13:50:41 UTC 2011 - coolo@novell.com
 
diff --git a/apache2-mod_perl.spec b/apache2-mod_perl.spec
index f8a79db..bb1341a 100644
--- a/apache2-mod_perl.spec
+++ b/apache2-mod_perl.spec
@@ -46,6 +46,7 @@ Version:        2.0.5
 Release:        1
 Source0:        http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
 Patch:          %{name}-2.0.4-tests.diff
+Patch1:         nolfs.patch
 #%define apache_test_version 1_99_15
 # cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic up -r MODPERL_%{apache_test_version}
 #Source1:      Apache-Test-%{apache_test_version}.tar.bz2
@@ -107,6 +108,7 @@ software depending on apache2-mod_perl.
 %prep
 #%setup -q -n modperl-2.0 -a 1
 %setup -q -n mod_perl-%{version}
+%patch1 -p1
 #%patch
 find -name ".svn" -type d | xargs rm -rfv
 
diff --git a/nolfs.patch b/nolfs.patch
new file mode 100644
index 0000000..0b397cf
--- /dev/null
+++ b/nolfs.patch
@@ -0,0 +1,14 @@
+Index: mod_perl-2.0.5/lib/Apache2/Build.pm
+===================================================================
+--- mod_perl-2.0.5.orig/lib/Apache2/Build.pm	2011-02-02 21:23:47.000000000 +0100
++++ mod_perl-2.0.5/lib/Apache2/Build.pm	2011-05-26 17:12:46.276946520 +0200
+@@ -2147,7 +2147,8 @@ sub has_large_files_conflict {
+     # with it is that we didn't have such a case yet, but may need to
+     # deal with it later
+ 
+-    return $perl_lfs64 ^ $apr_lfs64;
++    return 0;
++    # $perl_lfs64 ^ $apr_lfs64;
+ }
+ 
+ # if perl is built with uselargefiles, but apr not, the build won't