diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 290dd21..2bb12e3 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -20,15 +20,28 @@ options=(debug emptydirs)
 source=(
   https://people.redhat.com/sgrubb/audit/$pkgname-$pkgver.tar.gz
   $pkgbase-3.0.8-config_paths.patch
+  #https://listman.redhat.com/archives/linux-audit/2022-February/msg00085.html
+  https://src.fedoraproject.org/rpms/audit/raw/rawhide/f/audit-3.0.8-flex-array-workaround.patch
+  https://src.fedoraproject.org/rpms/audit/raw/rawhide/f/audit-3.0.8-undo-flex-array.patch
 )
 sha512sums=('8379bf425d68381d182300e628e42de8460d2f3e15b2395e10880f94b9989656852a50a9bece75b632ec8a04c40c9e666ff4c9d6b25ace3a8f50d2011506afab'
-            'bc699123f810abcf9300728bf61d7fcfcc83677b75fbeb713fb24cc11b2f9edf687661aab70766acde7c3c41c6a62f8e0a54cdfb49d1c7ce2246b67fbe3feec5')
+            'bc699123f810abcf9300728bf61d7fcfcc83677b75fbeb713fb24cc11b2f9edf687661aab70766acde7c3c41c6a62f8e0a54cdfb49d1c7ce2246b67fbe3feec5'
+            '442bffac895abbd0abe455c36ebc03ed5a9faee16b57347ef1f37c0d9c33777e204da917be3bbe11c56173c2ec96eed60646ac7214da47f828eef5fa104c1ebb'
+            '92ba0f9b3d3721bf64b56e2f3e2ac4e54b2b6acd9d5646a5ee97eea244cb165e19a56c362de16834925ae063c79e6505687749f1dd67dd0f2997919aea7cb2ef')
 b2sums=('38a35a7540e608127cfc54a2de2cb12df8c29e778799ca53318824c84565a67b7ea131f9bba455fa469ce9139a27908738f571a6e383ce9a3274f70c09d27ec7'
-        '50be1b4f76ace20d8d14b4c57a9bb69daa3da35fd654aca8730bc287682fe38f1c1917b37469fb087daf9f309ffc15cca15f54166ece0a055f540c2604778fc6')
+        '50be1b4f76ace20d8d14b4c57a9bb69daa3da35fd654aca8730bc287682fe38f1c1917b37469fb087daf9f309ffc15cca15f54166ece0a055f540c2604778fc6'
+        '2241c3dd29c803493ac8e85afd6031749a46b583514829b8761c24ae12061999b7c95107ec2948dd7edb239f805ca088b7b24229abb5445a4767702539779b0f'
+        'd89110c32da33c2ca9292391ead930352e4c8935aa86111640130d9e3fbc0ebe27b069a83812530dfbbf28f4ddd33545658c8061d87bfac9a9d3a6a5ff0be4b8')
 
 prepare() {
+  cd $pkgbase-$pkgver
   # replace the use of /sbin with /usr/bin in configs
-  patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-3.0.8-config_paths.patch
+  patch -Np1 -i ../$pkgbase-3.0.8-config_paths.patch
+
+  # copy audit.h from linux-api-headers so the local copy can have its flexible array converted back to a zero-length array
+  cp /usr/include/linux/audit.h lib/
+  # patch local copy of header and patch code to use local copy
+  patch -Np1 -i ../audit-3.0.8-flex-array-workaround.patch
 }
 
 build() {
@@ -64,6 +77,9 @@ package_audit() {
 
   make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver
 
+  # patch code to restore use of system header so other libaries can find the hader
+  patch -Np1 -d "$pkgdir"/usr -i "$srcdir"/audit-3.0.8-undo-flex-array.patch
+
   # add log dir
   install -vdm 700 "$pkgdir/var/log/$pkgname"